-
-
Notifications
You must be signed in to change notification settings - Fork 235
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'openhab:main' into blockly_new_blocks2
- Loading branch information
Showing
16 changed files
with
357 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <features name="org.openhab.ui.basic-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> | ||
| <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository> | ||
|
|
||
| <feature name="openhab-ui-basic" description="Basic UI" version="${project.version}"> | ||
| <feature>openhab-core-ui</feature> | ||
| <feature>openhab-core-io-rest-sitemap</feature> | ||
| <bundle>mvn:org.openhab.ui.bundles/org.openhab.ui.basic/${project.version}</bundle> | ||
| <configfile finalname="${openhab.conf}/services/basicui.cfg" override="false">mvn:org.openhab.ui.features/org.openhab.ui.features.openhab-ui-external/${project.version}/cfg/basic</configfile> | ||
| </feature> | ||
| </features> |
12 changes: 12 additions & 0 deletions
12
bundles/org.openhab.ui.cometvisu.php/src/main/feature/feature.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <features name="org.openhab.ui.cometvisu-php-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> | ||
| <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository> | ||
| <repository>mvn:org.openhab.ui.bundles/org.openhab.ui.cometvisu/${project.version}/xml/features</repository> | ||
|
|
||
| <feature name="openhab-ui-cometvisu-php" description="PHP support for CometVisu" version="${project.version}"> | ||
| <feature>openhab-core-ui</feature> | ||
| <feature>openhab-ui-cometvisu</feature> | ||
| <bundle>mvn:org.openhab.ui.bundles/org.openhab.ui.cometvisu.php/${project.version}</bundle> | ||
| <bundle>mvn:org.openhab/com.caucho.quercus/4.0.45</bundle> | ||
| </feature> | ||
| </features> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
bundles/org.openhab.ui.cometvisu/src/main/feature/feature.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <features name="org.openhab.ui.cometvisu-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> | ||
| <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository> | ||
|
|
||
| <feature name="openhab-ui-cometvisu" description="CometVisu Backend" version="${project.version}"> | ||
| <feature>openhab-core-model-item</feature> | ||
| <feature>openhab-core-model-sitemap</feature> | ||
| <feature>openhab-core-ui-icon</feature> | ||
| <feature>openhab-core-ui</feature> | ||
| <feature dependency="true">openhab.tp-jaxb</feature> | ||
| <feature dependency="true">openhab.tp-jackson</feature> | ||
| <bundle dependency="true">mvn:org.rrd4j/rrd4j/3.8.2</bundle> | ||
| <bundle>mvn:org.openhab.ui.bundles/org.openhab.ui.cometvisu/${project.version}</bundle> | ||
| <config name="org.openhab.cometvisu"> | ||
| webFolder=../../../CometVisu/src/ | ||
|
|
||
| icons>enableMapping=true | ||
|
|
||
| icons.mapping>firstfloor=control_building_int_og | ||
| icons.mapping>groundfloor=control_building_int_eg | ||
| icons.mapping>cellar=control_building_int_kg | ||
| icons.mapping>garden=scene_garden | ||
| icons.mapping>sun=weather_sun | ||
| icons.mapping>video=scene_livingroom | ||
| icons.mapping>kitchen=scene_dinner | ||
| icons.mapping>bath=scene_bath | ||
| icons.mapping>corridor=scene_hall | ||
| icons.mapping>office=scene_office | ||
| icons.mapping>boy1=scene_childs_room | ||
| icons.mapping>bedroom=scene_sleeping | ||
| icons.mapping>heating=sani_heating | ||
| icons.mapping>temperature=temp_temperature | ||
| icons.mapping>contact=fts_window_1w | ||
| </config> | ||
| </feature> | ||
| </features> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <features name="org.openhab.ui.habot-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> | ||
| <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository> | ||
|
|
||
| <feature name="openhab-ui-habot" description="HABot" version="${project.version}"> | ||
| <feature>openhab-core-model-script</feature> | ||
| <feature>openhab-core-ui</feature> | ||
| <bundle>mvn:org.openhab.ui.bundles/org.openhab.ui.habot/${project.version}</bundle> | ||
| <bundle>mvn:org.openhab.core.bundles/org.openhab.core.semantics/${project.version}</bundle> | ||
| <bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.rest/${project.version}</bundle> | ||
| <bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk15on/1.69</bundle> | ||
| <bundle dependency="true">mvn:org.apache.opennlp/opennlp-tools/1.9.3</bundle> | ||
| <bundle dependency="true">mvn:org.bitbucket.b_c/jose4j/0.7.9</bundle> | ||
| </feature> | ||
| </features> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <features name="org.openhab.ui.habpanel-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> | ||
| <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository> | ||
|
|
||
| <feature name="openhab-ui-habpanel" description="HABPanel" version="${project.version}"> | ||
| <feature>openhab-core-ui</feature> | ||
| <bundle>mvn:org.openhab.ui.bundles/org.openhab.ui.habpanel/${project.version}</bundle> | ||
| </feature> | ||
| </features> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.openhab.ui.features</groupId> | ||
| <artifactId>org.openhab.ui.reactor.features</artifactId> | ||
| <version>3.4.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>org.openhab.ui.features.openhab-ui-external</artifactId> | ||
| <packaging>pom</packaging> | ||
|
|
||
| <name>openHAB UI :: Features :: UI External</name> | ||
| <description>openHAB UI External</description> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>build-helper-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-artifact</id> | ||
| <goals> | ||
| <goal>attach-artifact</goal> | ||
| </goals> | ||
| <phase>package</phase> | ||
| <configuration> | ||
| <artifacts> | ||
| <artifact> | ||
| <file>src/main/resources/conf/basicui.cfg</file> | ||
| <type>cfg</type> | ||
| <classifier>basic</classifier> | ||
| </artifact> | ||
| </artifacts> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
23 changes: 23 additions & 0 deletions
23
features/openhab-ui-external/src/main/resources/conf/basicui.cfg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # Defines the UI theme. | ||
| # | ||
| #theme=default | ||
|
|
||
| # Defines whether UI renders icons for the widgets or not. | ||
| # | ||
| #enableIcons=true | ||
|
|
||
| # When enabled, changes the layout so that more widgets can fit on the screen. | ||
| # | ||
| #condensedLayout=false | ||
|
|
||
| # Displays all widget states in uppercase. | ||
| # | ||
| #capitalizeValues=false | ||
|
|
||
| # Play audio sent to the web audio sink. | ||
| # | ||
| #webAudio=false | ||
|
|
||
| # The sitemap to show if no parameter is passed. | ||
| # | ||
| #defaultSitemap= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.openhab.ui.features</groupId> | ||
| <artifactId>org.openhab.ui.reactor.features</artifactId> | ||
| <version>3.4.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>org.openhab.ui.features</artifactId> | ||
|
|
||
| <packaging>feature</packaging> | ||
|
|
||
| <name>openHAB UI :: Features :: UI</name> | ||
| <description>openHAB UI Features</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>org.openhab.ui.features.openhab-ui-external</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>pom</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-antrun-plugin</artifactId> | ||
| <version>1.8</version> | ||
| <inherited>false</inherited> | ||
| <executions> | ||
| <execution> | ||
| <id>create-karaf-features</id> | ||
| <goals> | ||
| <goal>run</goal> | ||
| </goals> | ||
| <phase>generate-sources</phase> | ||
| <configuration> | ||
| <target> | ||
| <concat destfile="src/main/feature/feature.xml"> | ||
| <header file="src/main/resources/header.xml" filtering="no"/> | ||
| <fileset dir="${basedirRoot}/bundles"> | ||
| <include name="*/src/main/feature/feature.xml"/> | ||
| </fileset> | ||
| <filterchain> | ||
| <linecontainsRegExp> | ||
| <regexp | ||
| pattern="(feature>)|(feature\s)|(bundle>)|(bundle\s)|(configfile>)|(configfile\s)"/> | ||
| </linecontainsRegExp> | ||
| </filterchain> | ||
| <footer file="src/main/resources/footer.xml" filtering="no"/> | ||
| </concat> | ||
| </target> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
|
|
||
| </features> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (c) 2010-2022 Contributors to the openHAB project | ||
| See the NOTICE file(s) distributed with this work for additional | ||
| information. | ||
| This program and the accompanying materials are made available under the | ||
| terms of the Eclipse Public License 2.0 which is available at | ||
| http://www.eclipse.org/legal/epl-2.0 | ||
| SPDX-License-Identifier: EPL-2.0 | ||
| --> | ||
| <features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> | ||
|
|
||
| <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository> |
Oops, something went wrong.