From 13d05bc8458758ee39cb829098241e89616717ee Mon Sep 17 00:00:00 2001 From: Ashlee Young Date: Wed, 9 Sep 2015 22:15:21 -0700 Subject: ONOS checkin based on commit tag e796610b1f721d02f9b0e213cf6f7790c10ecd60 Change-Id: Ife8810491034fe7becdba75dda20de4267bd15cd --- .../src/onos/tools/package/archetypes/api/pom.xml | 31 ++++ .../META-INF/maven/archetype-metadata.xml | 30 ++++ .../src/main/resources/archetype-resources/pom.xml | 60 +++++++ .../src/main/java/AppService.java | 26 +++ .../resources/projects/basic/archetype.properties | 21 +++ .../api/src/test/resources/projects/basic/goal.txt | 0 .../onos/tools/package/archetypes/bundle/pom.xml | 31 ++++ .../META-INF/maven/archetype-metadata.xml | 36 ++++ .../src/main/resources/archetype-resources/pom.xml | 139 +++++++++++++++ .../src/main/java/AppComponent.java | 46 +++++ .../src/test/java/AppComponentTest.java | 49 ++++++ .../resources/projects/basic/archetype.properties | 21 +++ .../src/test/resources/projects/basic/goal.txt | 0 .../src/onos/tools/package/archetypes/cli/pom.xml | 32 ++++ .../META-INF/maven/archetype-metadata.xml | 36 ++++ .../src/main/resources/archetype-resources/pom.xml | 126 ++++++++++++++ .../src/main/java/AppCommand.java | 33 ++++ .../resources/OSGI-INF/blueprint/shell-config.xml | 24 +++ .../resources/projects/basic/archetype.properties | 21 +++ .../cli/src/test/resources/projects/basic/goal.txt | 0 .../src/onos/tools/package/archetypes/pom.xml | 62 +++++++ .../src/onos/tools/package/archetypes/ui/pom.xml | 31 ++++ .../META-INF/maven/archetype-metadata.xml | 38 +++++ .../src/main/resources/archetype-resources/pom.xml | 139 +++++++++++++++ .../src/main/java/AppUiComponent.java | 76 +++++++++ .../src/main/java/AppUiMessageHandler.java | 189 +++++++++++++++++++++ .../src/main/resources/app/view/sample/sample.css | 35 ++++ .../src/main/resources/app/view/sample/sample.html | 46 +++++ .../src/main/resources/app/view/sample/sample.js | 139 +++++++++++++++ .../src/main/resources/css.html | 1 + .../archetype-resources/src/main/resources/js.html | 1 + .../resources/projects/basic/archetype.properties | 21 +++ .../ui/src/test/resources/projects/basic/goal.txt | 0 33 files changed, 1540 insertions(+) create mode 100644 framework/src/onos/tools/package/archetypes/api/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml create mode 100644 framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/src/main/java/AppService.java create mode 100644 framework/src/onos/tools/package/archetypes/api/src/test/resources/projects/basic/archetype.properties create mode 100644 framework/src/onos/tools/package/archetypes/api/src/test/resources/projects/basic/goal.txt create mode 100644 framework/src/onos/tools/package/archetypes/bundle/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml create mode 100644 framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/AppComponent.java create mode 100644 framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/test/java/AppComponentTest.java create mode 100644 framework/src/onos/tools/package/archetypes/bundle/src/test/resources/projects/basic/archetype.properties create mode 100644 framework/src/onos/tools/package/archetypes/bundle/src/test/resources/projects/basic/goal.txt create mode 100644 framework/src/onos/tools/package/archetypes/cli/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml create mode 100644 framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/AppCommand.java create mode 100644 framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-config.xml create mode 100644 framework/src/onos/tools/package/archetypes/cli/src/test/resources/projects/basic/archetype.properties create mode 100644 framework/src/onos/tools/package/archetypes/cli/src/test/resources/projects/basic/goal.txt create mode 100644 framework/src/onos/tools/package/archetypes/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/ui/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiMessageHandler.java create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.css create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.html create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.js create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/css.html create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/js.html create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/test/resources/projects/basic/archetype.properties create mode 100644 framework/src/onos/tools/package/archetypes/ui/src/test/resources/projects/basic/goal.txt (limited to 'framework/src/onos/tools/package/archetypes') diff --git a/framework/src/onos/tools/package/archetypes/api/pom.xml b/framework/src/onos/tools/package/archetypes/api/pom.xml new file mode 100644 index 00000000..d34db1f0 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/api/pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + + org.onosproject + onos-archetypes + 1.3.0-SNAPSHOT + + + onos-api-archetype + maven-archetype + + ONOS OSGi API bundle archetype + + diff --git a/framework/src/onos/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml b/framework/src/onos/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 00000000..e35285e6 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,30 @@ + + + + + + src/main/java + + **/*.java + + + + diff --git a/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 00000000..f29a327a --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,60 @@ + + + + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + bundle + + ONOS OSGi API bundle archetype + http://onosproject.org + + + 1.3.0-SNAPSHOT + + + + + org.onosproject + onos-api + ${onos.version} + + + + + + + org.apache.felix + maven-bundle-plugin + 2.5.3 + true + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.8 + 1.8 + + + + + + diff --git a/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/src/main/java/AppService.java b/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/src/main/java/AppService.java new file mode 100644 index 00000000..4878f2ba --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/src/main/java/AppService.java @@ -0,0 +1,26 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/* + * Copyright 2014 Open Networking Laboratory + * + * 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. + */ +package ${package}; + +/** + * Skeletal ONOS application API. + */ +public interface AppService { + +} diff --git a/framework/src/onos/tools/package/archetypes/api/src/test/resources/projects/basic/archetype.properties b/framework/src/onos/tools/package/archetypes/api/src/test/resources/projects/basic/archetype.properties new file mode 100644 index 00000000..a1213b40 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/api/src/test/resources/projects/basic/archetype.properties @@ -0,0 +1,21 @@ +# +# Copyright 2014 Open Networking Laboratory +# +# 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. +# + +#Thu Dec 04 09:24:50 PST 2014 +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=basic diff --git a/framework/src/onos/tools/package/archetypes/api/src/test/resources/projects/basic/goal.txt b/framework/src/onos/tools/package/archetypes/api/src/test/resources/projects/basic/goal.txt new file mode 100644 index 00000000..e69de29b diff --git a/framework/src/onos/tools/package/archetypes/bundle/pom.xml b/framework/src/onos/tools/package/archetypes/bundle/pom.xml new file mode 100644 index 00000000..ff6aa52e --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/bundle/pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + + org.onosproject + onos-archetypes + 1.3.0-SNAPSHOT + + + onos-bundle-archetype + maven-archetype + + ONOS OSGi bundle archetype + + diff --git a/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 00000000..ef60bd05 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,36 @@ + + + + + + src/main/java + + **/*.java + + + + src/test/java + + **/*.java + + + + diff --git a/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 00000000..c9e747c9 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,139 @@ + + + + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + bundle + + ONOS OSGi bundle archetype + http://onosproject.org + + + 1.3.0-SNAPSHOT + + + + + + org.onosproject + onos-api + ${onos.version} + + + + org.onosproject + onlab-osgi + ${onos.version} + + + + junit + junit + 4.11 + test + + + + org.onosproject + onos-api + ${onos.version} + test + tests + + + + org.apache.felix + org.apache.felix.scr.annotations + 1.9.8 + provided + + + + + + + org.apache.felix + maven-bundle-plugin + 2.5.3 + true + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.8 + 1.8 + + + + org.apache.felix + maven-scr-plugin + 1.20.0 + + + generate-scr-srcdescriptor + + scr + + + + + + bundle + war + + + + + org.onosproject + onos-maven-plugin + 1.5 + + + cfg + generate-resources + + cfg + + + + swagger + generate-sources + + swagger + + + + app + package + + app + + + + + + + + diff --git a/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/AppComponent.java b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/AppComponent.java new file mode 100644 index 00000000..693b6fd4 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/main/java/AppComponent.java @@ -0,0 +1,46 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/* + * Copyright 2014 Open Networking Laboratory + * + * 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. + */ +package ${package}; + +import org.apache.felix.scr.annotations.Activate; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Deactivate; +import org.apache.felix.scr.annotations.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Skeletal ONOS application component. + */ +@Component(immediate = true) +public class AppComponent { + + private final Logger log = LoggerFactory.getLogger(getClass()); + + @Activate + protected void activate() { + log.info("Started"); + } + + @Deactivate + protected void deactivate() { + log.info("Stopped"); + } + +} diff --git a/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/test/java/AppComponentTest.java b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/test/java/AppComponentTest.java new file mode 100644 index 00000000..b981225d --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/src/test/java/AppComponentTest.java @@ -0,0 +1,49 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/* + * Copyright 2014 Open Networking Laboratory + * + * 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. + */ +package ${package}; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Set of tests of the ONOS application component. + */ +public class AppComponentTest { + + private AppComponent component; + + @Before + public void setUp() { + component = new AppComponent(); + component.activate(); + + } + + @After + public void tearDown() { + component.deactivate(); + } + + @Test + public void basics() { + + } + +} diff --git a/framework/src/onos/tools/package/archetypes/bundle/src/test/resources/projects/basic/archetype.properties b/framework/src/onos/tools/package/archetypes/bundle/src/test/resources/projects/basic/archetype.properties new file mode 100644 index 00000000..a1213b40 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/bundle/src/test/resources/projects/basic/archetype.properties @@ -0,0 +1,21 @@ +# +# Copyright 2014 Open Networking Laboratory +# +# 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. +# + +#Thu Dec 04 09:24:50 PST 2014 +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=basic diff --git a/framework/src/onos/tools/package/archetypes/bundle/src/test/resources/projects/basic/goal.txt b/framework/src/onos/tools/package/archetypes/bundle/src/test/resources/projects/basic/goal.txt new file mode 100644 index 00000000..e69de29b diff --git a/framework/src/onos/tools/package/archetypes/cli/pom.xml b/framework/src/onos/tools/package/archetypes/cli/pom.xml new file mode 100644 index 00000000..1ab9c1f2 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/cli/pom.xml @@ -0,0 +1,32 @@ + + + + 4.0.0 + + + org.onosproject + onos-archetypes + 1.3.0-SNAPSHOT + + + onos-cli-archetype + maven-archetype + + onos-cli-archetype + ONOS Apache Karaf bundle archetype + + diff --git a/framework/src/onos/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 00000000..8558d476 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,36 @@ + + + + + + src/main/java + + **/*.java + + + + src/main/resources + + **/*.xml + + + + diff --git a/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 00000000..cb3862c3 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,126 @@ + + + + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + bundle + + ONOS OSGi bundle archetype + http://onosproject.org + + + 1.3.0-SNAPSHOT + + + + + org.onosproject + onos-api + ${onos.version} + + + + org.onosproject + onlab-osgi + ${onos.version} + + + + junit + junit + 4.11 + test + + + + org.onosproject + onos-cli + ${onos.version} + provided + + + + org.onosproject + onos-api + ${onos.version} + test + tests + + + + org.osgi + org.osgi.core + 4.3.1 + provided + + + org.apache.felix + org.apache.felix.scr.annotations + 1.9.8 + provided + + + org.apache.karaf.shell + org.apache.karaf.shell.console + 3.0.3 + provided + + + + + + + org.apache.felix + maven-bundle-plugin + 2.5.3 + true + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.8 + 1.8 + + + + org.apache.felix + maven-scr-plugin + 1.20.0 + + + generate-scr-srcdescriptor + + scr + + + + + + bundle + war + + + + + + + diff --git a/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/AppCommand.java b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/AppCommand.java new file mode 100644 index 00000000..9262b2e4 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/java/AppCommand.java @@ -0,0 +1,33 @@ +/* + * Copyright 2014 Open Networking Laboratory + * + * 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. + */ +package ${package}; + +import org.apache.karaf.shell.commands.Command; +import org.onosproject.cli.AbstractShellCommand; + +/** + * Sample Apache Karaf CLI command + */ +@Command(scope = "onos", name = "sample", + description = "Sample Apache Karaf CLI command") +public class AppCommand extends AbstractShellCommand { + + @Override + protected void execute() { + print("Hello %s", "World"); + } + +} diff --git a/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-config.xml new file mode 100644 index 00000000..202ab9ed --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/shell-config.xml @@ -0,0 +1,24 @@ + + + + + + + + + + diff --git a/framework/src/onos/tools/package/archetypes/cli/src/test/resources/projects/basic/archetype.properties b/framework/src/onos/tools/package/archetypes/cli/src/test/resources/projects/basic/archetype.properties new file mode 100644 index 00000000..a1213b40 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/cli/src/test/resources/projects/basic/archetype.properties @@ -0,0 +1,21 @@ +# +# Copyright 2014 Open Networking Laboratory +# +# 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. +# + +#Thu Dec 04 09:24:50 PST 2014 +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=basic diff --git a/framework/src/onos/tools/package/archetypes/cli/src/test/resources/projects/basic/goal.txt b/framework/src/onos/tools/package/archetypes/cli/src/test/resources/projects/basic/goal.txt new file mode 100644 index 00000000..e69de29b diff --git a/framework/src/onos/tools/package/archetypes/pom.xml b/framework/src/onos/tools/package/archetypes/pom.xml new file mode 100644 index 00000000..2fd5f874 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/pom.xml @@ -0,0 +1,62 @@ + + + + 4.0.0 + + + org.onosproject + onos-base + 1 + ../../build/pom.xml + + + org.onosproject + onos-archetypes + 1.3.0-SNAPSHOT + pom + + ONOS archetypes project + + + api + bundle + cli + ui + + + + + + org.apache.maven.archetype + archetype-packaging + 2.2 + + + + + + + maven-archetype-plugin + 2.2 + + + + + + diff --git a/framework/src/onos/tools/package/archetypes/ui/pom.xml b/framework/src/onos/tools/package/archetypes/ui/pom.xml new file mode 100644 index 00000000..ca7b2d87 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + + org.onosproject + onos-archetypes + 1.3.0-SNAPSHOT + + + onos-ui-archetype + maven-archetype + + ONOS UI overlay archetype + + diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 00000000..309fd6ad --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,38 @@ + + + + + + src/main/java + + **/*.java + + + + src/main/resources + + **/*.html + **/*.js + **/*.css + + + + diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml new file mode 100644 index 00000000..a6beae99 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml @@ -0,0 +1,139 @@ + + + + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + bundle + + ONOS OSGi UI bundle archetype + http://onosproject.org + + + 1.3.0-SNAPSHOT + + + + + + org.onosproject + onos-api + ${onos.version} + + + + org.onosproject + onlab-osgi + ${onos.version} + + + + junit + junit + 4.11 + test + + + + org.onosproject + onos-api + ${onos.version} + test + tests + + + + org.apache.felix + org.apache.felix.scr.annotations + 1.9.8 + provided + + + + + + + org.apache.felix + maven-bundle-plugin + 2.5.3 + true + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.8 + 1.8 + + + + org.apache.felix + maven-scr-plugin + 1.20.0 + + + generate-scr-srcdescriptor + + scr + + + + + + bundle + war + + + + + org.onosproject + onos-maven-plugin + 1.5 + + + cfg + generate-resources + + cfg + + + + swagger + generate-sources + + swagger + + + + app + package + + app + + + + + + + + diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java new file mode 100644 index 00000000..f40bcb5f --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiComponent.java @@ -0,0 +1,76 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/* + * Copyright 2014,2015 Open Networking Laboratory + * + * 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. + */ +package ${package}; + +import com.google.common.collect.ImmutableList; +import org.apache.felix.scr.annotations.Activate; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Deactivate; +import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.ReferenceCardinality; +import org.onosproject.ui.UiExtension; +import org.onosproject.ui.UiExtensionService; +import org.onosproject.ui.UiMessageHandlerFactory; +import org.onosproject.ui.UiView; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +/** + * Skeletal ONOS UI application component. + */ +@Component(immediate = true) +public class AppUiComponent { + + private final Logger log = LoggerFactory.getLogger(getClass()); + + @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) + protected UiExtensionService uiExtensionService; + + // List of application views + private final List uiViews = ImmutableList.of( + new UiView(UiView.Category.OTHER, "sample", "Sample") + ); + + // Factory for UI message handlers + private final UiMessageHandlerFactory messageHandlerFactory = + () -> ImmutableList.of( + new AppUiMessageHandler() + ); + + // Application UI extension + protected UiExtension extension = + new UiExtension.Builder(getClass().getClassLoader(), uiViews) + .messageHandlerFactory(messageHandlerFactory) + .build(); + + @Activate + protected void activate() { + uiExtensionService.register(extension); + log.info("Started"); + } + + @Deactivate + protected void deactivate() { + uiExtensionService.unregister(extension); + log.info("Stopped"); + } + +} diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiMessageHandler.java b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiMessageHandler.java new file mode 100644 index 00000000..d9d68b53 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/java/AppUiMessageHandler.java @@ -0,0 +1,189 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/* + * Copyright 2014,2015 Open Networking Laboratory + * + * 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. + */ +package ${package}; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.collect.ImmutableSet; +import org.onosproject.ui.RequestHandler; +import org.onosproject.ui.UiMessageHandler; +import org.onosproject.ui.table.TableModel; +import org.onosproject.ui.table.TableRequestHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.lang.Override; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * Skeletal ONOS UI message handler. + *

+ * This example specifically supporting a "table" view. + */ +public class AppUiMessageHandler extends UiMessageHandler { + + private static final String SAMPLE_DATA_REQ = "sampleDataRequest"; + private static final String SAMPLE_DATA_RESP = "sampleDataResponse"; + private static final String SAMPLES = "samples"; + + private static final String SAMPLE_DETAIL_REQ = "sampleDetailsRequest"; + private static final String SAMPLE_DETAIL_RESP = "sampleDetailsResponse"; + private static final String DETAILS = "details"; + + private static final String ID = "id"; + private static final String LABEL = "label"; + private static final String CODE = "code"; + private static final String COMMENT = "comment"; + private static final String RESULT = "result"; + + private static final String[] COLUMN_IDS = { ID, LABEL, CODE }; + + private final Logger log = LoggerFactory.getLogger(getClass()); + + + @Override + protected Collection createRequestHandlers() { + return ImmutableSet.of( + new SampleDataRequestHandler(), + new SampleDetailRequestHandler() + ); + } + + // handler for sample table requests + private final class SampleDataRequestHandler extends TableRequestHandler { + + private SampleDataRequestHandler() { + super(SAMPLE_DATA_REQ, SAMPLE_DATA_RESP, SAMPLES); + } + + // if necessary, override defaultColumnId() -- if it isn't "id" + + @Override + protected String[] getColumnIds() { + return COLUMN_IDS; + } + + @Override + protected void populateTable(TableModel tm, ObjectNode payload) { + // === set custom column cell formatters/comparators if need be... + // tm.setFormatter(CODE, new CodeFormatter()); + // tm.setComparator(CODE, new CodeComparator()); + + // === retrieve table row items from some service... + // SomeService ss = get(SomeService.class); + // List items = ss.getItems() + + // fake data for demonstration purposes... + List items = getItems(); + for (Item item: items) { + populateRow(tm.addRow(), item); + } + } + + private void populateRow(TableModel.Row row, Item item) { + row.cell(ID, item.id()) + .cell(LABEL, item.label()) + .cell(CODE, item.code()); + } + } + + + // handler for sample item details requests + private final class SampleDetailRequestHandler extends RequestHandler { + + private SampleDetailRequestHandler() { + super(SAMPLE_DETAIL_REQ); + } + + @Override + public void process(long sid, ObjectNode payload) { + String id = string(payload, ID, "(none)"); + + // SomeService ss = get(SomeService.class); + // Item item = ss.getItemDetails(id) + + // fake data for demonstration purposes... + Item item = getItem(id); + + ObjectNode rootNode = MAPPER.createObjectNode(); + ObjectNode data = MAPPER.createObjectNode(); + rootNode.set(DETAILS, data); + + if (item == null) { + rootNode.put(RESULT, "Item with id '" + id + "' not found"); + log.warn("attempted to get item detail for id '{}'", id); + + } else { + rootNode.put(RESULT, "Found item with id '" + id + "'"); + + data.put(ID, item.id()); + data.put(LABEL, item.label()); + data.put(CODE, item.code()); + data.put(COMMENT, "Some arbitrary comment"); + } + + sendMessage(SAMPLE_DETAIL_RESP, 0, rootNode); + } + } + + + // =================================================================== + // NOTE: The code below this line is to create fake data for this + // sample code. Normally you would use existing services to + // provide real data. + + // Lookup a single item. + private static Item getItem(String id) { + // We realize this code is really inefficient, but + // it suffices for our purposes of demonstration... + for (Item item : getItems()) { + if (item.id().equals(id)) { + return item; + } + } + return null; + } + + // Produce a list of items. + private static List getItems() { + List items = new ArrayList<>(); + items.add(new Item("item-1", "foo", 42)); + items.add(new Item("item-2", "bar", 99)); + items.add(new Item("item-3", "baz", 65)); + return items; + } + + // Simple model class to provide sample data + private static class Item { + private final String id; + private final String label; + private final int code; + + Item(String id, String label, int code) { + this.id = id; + this.label = label; + this.code = code; + } + + String id() { return id; } + String label() { return label; } + int code() { return code; } + } +} \ No newline at end of file diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.css b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.css new file mode 100644 index 00000000..c492e203 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.css @@ -0,0 +1,35 @@ +/* css for sample app view */ + +#ov-sample h2 { + display: inline-block; +} + +/* Panel Styling */ +#item-details-panel.floatpanel { + position: absolute; + top: 115px; +} + +.light #item-details-panel.floatpanel { + background-color: rgb(229, 234, 237); +} +.dark #item-details-panel.floatpanel { + background-color: #3A4042; +} + +#item-details-panel h3 { + margin: 0; + font-size: large; +} + +#item-details-panel h4 { + margin: 0; +} + +#item-details-panel td { + padding: 5px; +} +#item-details-panel td.label { + font-style: italic; + opacity: 0.8; +} \ No newline at end of file diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.html b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.html new file mode 100644 index 00000000..03a7383e --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.html @@ -0,0 +1,46 @@ + +

+
+

Items ({{tableData.length}} total)

+
+
+
+
+ +
+ +
+ + + + + + +
Item ID Label Code
+
+ +
+ + + + + + + + + + +
+ No Items found +
{{item.id}}{{item.label}}{{item.code}}
+
+ +
+ + +
diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.js b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.js new file mode 100644 index 00000000..2d4aed48 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/app/view/sample/sample.js @@ -0,0 +1,139 @@ +// js for sample app view +(function () { + 'use strict'; + + // injected refs + var $log, $scope, fs, wss, ps; + + // constants + var detailsReq = 'sampleDetailsRequest', + detailsResp = 'sampleDetailsResponse', + pName = 'item-details-panel', + + propOrder = ['id', 'label', 'code'], + friendlyProps = ['Item ID', 'Item Label', 'Special Code']; + + + function addProp(tbody, index, value) { + var tr = tbody.append('tr'); + + function addCell(cls, txt) { + tr.append('td').attr('class', cls).html(txt); + } + addCell('label', friendlyProps[index] + ' :'); + addCell('value', value); + } + + function populatePanel(panel) { + var title = panel.append('h3'), + tbody = panel.append('table').append('tbody'); + + title.text('Item Details'); + + propOrder.forEach(function (prop, i) { + addProp(tbody, i, $scope.panelDetails[prop]); + }); + + panel.append('hr'); + panel.append('h4').text('Comments'); + panel.append('p').text($scope.panelDetails.comment); + } + + function respDetailsCb(data) { + $scope.panelDetails = data.details; + $scope.$apply(); + } + + angular.module('ovSample', []) + .controller('OvSampleCtrl', + ['$log', '$scope', 'TableBuilderService', + 'FnService', 'WebSocketService', + + function (_$log_, _$scope_, tbs, _fs_, _wss_) { + $log = _$log_; + $scope = _$scope_; + fs = _fs_; + wss = _wss_; + + var handlers = {}; + $scope.panelDetails = {}; + + // details response handler + handlers[detailsResp] = respDetailsCb; + wss.bindHandlers(handlers); + + // custom selection callback + function selCb($event, row) { + if ($scope.selId) { + wss.sendEvent(detailsReq, { id: row.id }); + } else { + $scope.hidePanel(); + } + $log.debug('Got a click on:', row); + } + + // TableBuilderService creating a table for us + tbs.buildTable({ + scope: $scope, + tag: 'sample', + selCb: selCb + }); + + // cleanup + $scope.$on('$destroy', function () { + wss.unbindHandlers(handlers); + }); + + $log.log('OvSampleCtrl has been created'); + }]) + + .directive('itemDetailsPanel', ['PanelService', 'KeyService', + function (_ps_, ks) { + return { + restrict: 'E', + link: function (scope, element, attrs) { + ps = _ps_; + // insert details panel with PanelService + // create the panel + var panel = ps.createPanel(pName, { + width: 200, + margin: 20, + hideMargin: 0 + }); + panel.hide(); + scope.hidePanel = function () { panel.hide(); }; + + function closePanel() { + if (panel.isVisible()) { + $scope.selId = null; + panel.hide(); + } + } + + // create key bindings to handle panel + ks.keyBindings({ + esc: [closePanel, 'Close the details panel'], + _helpFormat: ['esc'] + }); + ks.gestureNotes([ + ['click', 'Select a row to show item details'] + ]); + + // update the panel's contents when the data is changed + scope.$watch('panelDetails', function () { + if (!fs.isEmptyObject(scope.panelDetails)) { + panel.empty(); + populatePanel(panel); + panel.show(); + } + }); + + // cleanup on destroyed scope + scope.$on('$destroy', function () { + ks.unbindKeys(); + ps.destroyPanel(pName); + }); + } + }; + }]); +}()); diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/css.html b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/css.html new file mode 100644 index 00000000..c4697256 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/css.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/js.html b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/js.html new file mode 100644 index 00000000..7cacc707 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/src/main/resources/js.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/framework/src/onos/tools/package/archetypes/ui/src/test/resources/projects/basic/archetype.properties b/framework/src/onos/tools/package/archetypes/ui/src/test/resources/projects/basic/archetype.properties new file mode 100644 index 00000000..a1213b40 --- /dev/null +++ b/framework/src/onos/tools/package/archetypes/ui/src/test/resources/projects/basic/archetype.properties @@ -0,0 +1,21 @@ +# +# Copyright 2014 Open Networking Laboratory +# +# 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. +# + +#Thu Dec 04 09:24:50 PST 2014 +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=basic diff --git a/framework/src/onos/tools/package/archetypes/ui/src/test/resources/projects/basic/goal.txt b/framework/src/onos/tools/package/archetypes/ui/src/test/resources/projects/basic/goal.txt new file mode 100644 index 00000000..e69de29b -- cgit 1.2.3-korg