olving dependncy issues

digitaldan · Jan 5, 2015 · f8828d8 · f8828d8
1 parent 2d1ed50
commit f8828d8
Show file tree

Hide file tree

Showing 16 changed files with 168 additions and 29 deletions.
diff --git a/bundles/action/org.openhab.action.harmonyhub/.classpath b/bundles/action/org.openhab.action.harmonyhub/.classpath
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openhab.binding.harmonyhub</name>
+	<comment>This is the HarmonyHub binding of the open Home Automation Bus (openHAB)</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/action/org.openhab.action.harmonyhub/.project b/bundles/action/org.openhab.action.harmonyhub/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openhab.action.harmonyhub</name>
+	<comment>This is the HarmonyHub Action addon of the open Home Automation Bus (openHAB)</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/action/org.openhab.action.harmonyhub/META-INF/MANIFEST.MF b/bundles/action/org.openhab.action.harmonyhub/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB HarmonyHub Action
 Bundle-SymbolicName: org.openhab.action.harmonyhub
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.6.0
+Bundle-Version: 1.7.0.qualifier
 Bundle-Activator: org.openhab.action.harmonyhub.internal.HarmonyHubActivator
 Bundle-ManifestVersion: 2
 Bundle-Description: This is the HarmonyHub action of the open Home Aut

diff --git a/bundles/action/org.openhab.action.harmonyhub/pom.xml b/bundles/action/org.openhab.action.harmonyhub/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openhab.bundles</groupId>
         <artifactId>action</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -23,7 +23,7 @@
 
     <packaging>eclipse-plugin</packaging>
 
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>

diff --git a/bundles/binding/org.openhab.binding.harmonyhub/.classpath b/bundles/binding/org.openhab.binding.harmonyhub/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/org.openhab.io.harmonyhub/lib/harmony-java-client-1.0.3-openhab.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/binding/org.openhab.binding.harmonyhub/.project b/bundles/binding/org.openhab.binding.harmonyhub/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openhab.binding.harmonyhub</name>
+	<comment>This is the HarmonyHub binding of the open Home Automation Bus (openHAB)</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/binding/org.openhab.binding.harmonyhub/META-INF/MANIFEST.MF b/bundles/binding/org.openhab.binding.harmonyhub/META-INF/MANIFEST.MF
@@ -5,14 +5,11 @@ Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Name: openHAB HarmonyHub Binding
 Bundle-SymbolicName: org.openhab.binding.harmonyhub
 Bundle-Vendor: openHAB.org
-Bundle-Version: 1.5.1
+Bundle-Version: 1.7.0.qualifier
 Bundle-Activator: org.openhab.binding.harmonyhub.internal.HarmonyHubActivator
 Bundle-ManifestVersion: 2
-Bundle-Description: This is the HarmonyHub binding of the open Home Aut
- omation Bus (openHAB)
-Import-Package: net.whistlingfish.harmony;version="1.0.2",
- net.whistlingfish.harmony.config;version="1.0.2",
- org.apache.commons.lang,
+Bundle-Description: This is the HarmonyHub binding of the open Home Automation Bus (openHAB)
+Import-Package: org.apache.commons.lang,
  org.openhab.core.binding,
  org.openhab.core.events,
  org.openhab.core.items,
@@ -30,4 +27,4 @@ Export-Package: org.openhab.binding.harmonyhub
 Bundle-DocURL: http://www.openhab.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/binding.xml, OSGI-INF/genericbindingprovider.xml
-Bundle-ClassPath: .
+Bundle-ClassPath: .,lib/harmony-java-client-1.0.3-openhab.jar
diff --git a/bundles/binding/org.openhab.binding.harmonyhub/build.properties b/bundles/binding/org.openhab.binding.harmonyhub/build.properties
@@ -2,5 +2,6 @@ source.. = src/main/java/,\
            src/main/resources/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/
+               OSGI-INF/,\
+               lib/harmony-java-client-1.0.3-openhab.jar
 output.. = target/classes/
diff --git a/bundles/binding/org.openhab.binding.harmonyhub/lib/harmony-java-client-1.0.3-openhab.jar b/bundles/binding/org.openhab.binding.harmonyhub/lib/harmony-java-client-1.0.3-openhab.jar
diff --git a/bundles/binding/org.openhab.binding.harmonyhub/pom.xml b/bundles/binding/org.openhab.binding.harmonyhub/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openhab.bundles</groupId>
         <artifactId>binding</artifactId>
-        <version>1.5.1</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -23,7 +23,7 @@
 
     <packaging>eclipse-plugin</packaging>
 
-    <version>1.5.1</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/bundles/io/org.openhab.io.harmonyhub/.classpath b/bundles/io/org.openhab.io.harmonyhub/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="lib" path="lib/harmony-java-client-1.0.3-all.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/io/org.openhab.io.harmonyhub/.project b/bundles/io/org.openhab.io.harmonyhub/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openhab.io.harmonyhub</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/io/org.openhab.io.harmonyhub/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.harmonyhub/META-INF/MANIFEST.MF
@@ -2,15 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: openHAB HarmonyHub IO Bundle
 Bundle-SymbolicName: org.openhab.io.harmonyhub;singleton:=true
-Bundle-Version: 1.6.0
+Bundle-Version: 1.7.0.qualifier
 Bundle-Vendor: openHAB.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.openhab.io.harmonyhub
-Import-Package: net.whistlingfish.harmony;version="1.0.3",
- org.apache.commons.lang;version="2.6.0",
+Import-Package: org.apache.commons.lang;version="2.6.0",
  org.openhab.core.events,
  org.osgi.service.cm;version="1.4.0",
  org.slf4j;version="1.6.4"
 Bundle-DocURL: http://www.openhab.org
 Service-Component: OSGI-INF/harmonyhub.xml
-Bundle-ClassPath: .
+Bundle-ClassPath: .,lib/harmony-java-client-1.0.3-openhab.jar
diff --git a/bundles/io/org.openhab.io.harmonyhub/build.properties b/bundles/io/org.openhab.io.harmonyhub/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\
                OSGI-INF/,\
+               lib/harmony-java-client-1.0.3-openhab.jar,\
                .
 jars.compile.order = .
 source.. = src/main/java/

diff --git a/bundles/io/org.openhab.io.harmonyhub/lib/harmony-java-client-1.0.3-openhab.jar b/bundles/io/org.openhab.io.harmonyhub/lib/harmony-java-client-1.0.3-openhab.jar
diff --git a/bundles/io/org.openhab.io.harmonyhub/pom.xml b/bundles/io/org.openhab.io.harmonyhub/pom.xml
@@ -6,10 +6,12 @@
   <parent>
     <groupId>org.openhab.bundles</groupId>
     <artifactId>io</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
   </parent>
 
-  <name>openHAB Squeeze Server</name>
+  <name>openHAB HarmonyHub</name>
+
+  <version>1.7.0-SNAPSHOT</version>
 
   <properties>
     <bundle.symbolicName>org.openhab.io.harmonyhub</bundle.symbolicName>
@@ -31,14 +33,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>net.whistlingfish</groupId>
-      <artifactId>harmony-client</artifactId>
-      <version>1.0.3</version>
-      <classifier>openhab</classifier>
-    </dependency>
-  </dependencies>
-
 </project>