HomePhabricator
Diffusion openhab2-addons 8d6318ce3ab3

Merge branch 'cups-binding' of https://github.com/peuter/openhab2 into peuter…
8d6318ce3ab3Unpublished
Actions

Authored by Kai Kreuzer <kai@openhab.org> on Apr 27 2015, 8:56 AM.

Unpublished Commit · Learn More

  • Repository Importing: This repository is still importing.
  • Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'cups-binding' of https://github.com/peuter/openhab2 into peuter-cups-binding

Added missing imports for java.xml

  1. Conflicts:
  2. addons/binding/pom.xml

Signed-off-by: Kai Kreuzer <kai@openhab.org> (github: @kaikreuzer)

Details

Committed
Kai Kreuzer <kai@openhab.org>Apr 27 2015, 8:56 AM
Parents
R40:a6177bf2d354: Merge pull request #211 from kgoderis/patch-3
Branches
Unknown
Tags
Unknown

Event Timeline

Changes (34)

PathPackages
A(dir)addons/binding/org.openhab.binding.ipp/
Paddons/binding/org.openhab.binding.ipp/.classpath
Copied from addons/binding/org.openhab.binding.autelis/.classpath
Paddons/binding/org.openhab.binding.ipp/.project
Copied from addons/binding/org.openhab.binding.max/.project
A(dir)addons/binding/org.openhab.binding.ipp/ESH-INF/
A(dir)addons/binding/org.openhab.binding.ipp/ESH-INF/binding/
Paddons/binding/org.openhab.binding.ipp/ESH-INF/binding/binding.xml
Copied from addons/binding/org.openhab.binding.max/ESH-INF/binding/binding.xml
A(dir)addons/binding/org.openhab.binding.ipp/ESH-INF/thing/
Aaddons/binding/org.openhab.binding.ipp/ESH-INF/thing/thing-types.xml
A(dir)addons/binding/org.openhab.binding.ipp/META-INF/
Aaddons/binding/org.openhab.binding.ipp/META-INF/MANIFEST.MF
A(dir)addons/binding/org.openhab.binding.ipp/OSGI-INF/
Paddons/binding/org.openhab.binding.ipp/OSGI-INF/IppHandlerFactory.xml
Copied from addons/binding/org.openhab.binding.astro/OSGI-INF/AstroHandlerFactory.xml
Aaddons/binding/org.openhab.binding.ipp/OSGI-INF/IppServerDiscovery.xml
Aaddons/binding/org.openhab.binding.ipp/about.html
Paddons/binding/org.openhab.binding.ipp/build.properties
Copied from addons/binding/org.openhab.binding.network/build.properties
A(dir)addons/binding/org.openhab.binding.ipp/lib/
Aaddons/binding/org.openhab.binding.ipp/lib/cups4j-0.6.4.jar
Paddons/binding/org.openhab.binding.ipp/pom.xml
Copied from addons/binding/org.openhab.binding.astro/pom.xml
A(dir)addons/binding/org.openhab.binding.ipp/src/
A(dir)addons/binding/org.openhab.binding.ipp/src/main/
A(dir)addons/binding/org.openhab.binding.ipp/src/main/java/
A(dir)addons/binding/org.openhab.binding.ipp/src/main/java/org/
A(dir)addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/
A(dir)addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/
A(dir)addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/
Aaddons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/IppBindingConstants.java
A(dir)addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/handler/
Aaddons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/handler/IppPrinterHandler.java
A(dir)addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/
Aaddons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/IppHandlerFactory.java
A(dir)addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/discovery/
Aaddons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/discovery/IppPrinterDiscoveryParticipant.java
Maddons/binding/pom.xml
Mtargetplatform/openHAB_Runtime.launch

R40:8d6318ce3ab3

View Options

addons/binding/org.openhab.binding.ipp/.classpath

Loading...
View Options

addons/binding/org.openhab.binding.ipp/.project

Loading...
View Options

addons/binding/org.openhab.binding.ipp/ESH-INF/binding/binding.xml

Loading...
View Options

addons/binding/org.openhab.binding.ipp/ESH-INF/thing/thing-types.xml

Loading...
View Options

addons/binding/org.openhab.binding.ipp/META-INF/MANIFEST.MF

Loading...
View Options

addons/binding/org.openhab.binding.ipp/OSGI-INF/IppHandlerFactory.xml

Loading...
View Options

addons/binding/org.openhab.binding.ipp/OSGI-INF/IppServerDiscovery.xml

Loading...
View Options

addons/binding/org.openhab.binding.ipp/about.html

Loading...
View Options

addons/binding/org.openhab.binding.ipp/build.properties

Loading...
View Options

addons/binding/org.openhab.binding.ipp/lib/cups4j-0.6.4.jar

Loading...
View Options

addons/binding/org.openhab.binding.ipp/pom.xml

Loading...
View Options

addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/IppBindingConstants.java

Loading...
View Options

addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/handler/IppPrinterHandler.java

Loading...
View Options

addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/IppHandlerFactory.java

Loading...
View Options

addons/binding/org.openhab.binding.ipp/src/main/java/org/openhab/binding/ipp/internal/discovery/IppPrinterDiscoveryParticipant.java

Loading...
View Options

addons/binding/pom.xml

Loading...
View Options

targetplatform/openHAB_Runtime.launch

Loading...