Resolved conflict. Helpers dependency added

miguelnunes miguelnunes 2015-01-02

added src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/Engine2.java
added output/scientific_linux_hardware.owl
added output/ehealth-hardware.owl
added output/eHealth-hardware.owl
added output/scientific_linux_hw_vm.owl
added output/linuxHardware.owl
added output/linux_hw_server.owl
added output/linux_hw_client.owl
added output/hardware-test.owl
added output/catalog-v001.xml
added output/hardwareClusterNodes.owl
added eHealth-hardware_bak.json
added output-example.owl
added testbed-extraction-hw.json
added timbus-cms@testbed.timbusproject.net
added eHealth-hardware.json
added Readme.md
changed META-INF/MANIFEST.MF
changed src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/LinuxHardwareConverter.java
changed pom.xml
copied src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/TestEngine.java -> src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/TestConverter.java
src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/Engine2.java Diff Switch to unified view
Loading...
output/scientific_linux_hardware.owl Diff Switch to unified view
Loading...
output/ehealth-hardware.owl Diff Switch to unified view
Loading...
output/eHealth-hardware.owl Diff Switch to unified view
Loading...
output/scientific_linux_hw_vm.owl Diff Switch to unified view
Loading...
output/linuxHardware.owl Diff Switch to unified view
Loading...
output/linux_hw_server.owl Diff Switch to unified view
Loading...
output/linux_hw_client.owl Diff Switch to unified view
Loading...
output/hardware-test.owl Diff Switch to unified view
Loading...
output/catalog-v001.xml Diff Switch to unified view
Loading...
output/hardwareClusterNodes.owl Diff Switch to unified view
Loading...
eHealth-hardware_bak.json Diff Switch to unified view
Loading...
output-example.owl Diff Switch to unified view
Loading...
testbed-extraction-hw.json Diff Switch to unified view
Loading...
timbus-cms@testbed.timbusproject.net Diff Switch to unified view
Loading...
eHealth-hardware.json Diff Switch to unified view
Loading...
Readme.md Diff Switch to unified view
Loading...
META-INF/MANIFEST.MF Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/LinuxHardwareConverter.java Diff Switch to unified view
Loading...
pom.xml Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/TestEngine.java to src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/TestConverter.java
--- a/src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/TestEngine.java
+++ b/src/main/java/net/timbusproject/populator/modules/linuxhardwareconverter/TestConverter.java
@@ -1,33 +1,31 @@
 package net.timbusproject.populator.modules.linuxhardwareconverter;
 
-import org.codehaus.jettison.json.JSONException;
-import org.semanticweb.owlapi.model.OWLOntologyCreationException;
-import org.semanticweb.owlapi.model.OWLOntologyStorageException;
-import pt.caixamagica.owl.owlapi.exceptions.OntologyCreationException;
-import pt.caixamagica.owl.owlapi.exceptions.OntologyFormatStorageException;
-
-import java.io.IOException;
-
-public class TestEngine {
-//vm test
-//    public static void main(String[] args) throws IOException, JSONException, OWLOntologyCreationException, OWLOntologyStorageException {
-//        Engine engine = new Engine();
-//        ReadJSON readJSON = new ReadJSON("vm.json");
-////        System.out.println(readJSON.getJsonObject().getJSONArray("children").toString(2));
-//        engine.run(readJSON.getJsonObject().getJSONArray("children").toString());
-////        engine.run(readJSON.getJsonObject().getJSONArray("return").getJSONObject(0).getJSONArray("children").toString(2));
-////        String result = engine.run(new ReadJSON("output_2.json").getJsonObject().getJSONArray("return").toString());
-////        String result = engine.run(readJSON.getJsonObject().getJSONArray("children").getJSONObject(0).getJSONArray("children").toString(2));
-////        System.out.println("Result " + result);
-////        System.out.println(readJSON.getJsonObject().getJSONArray("children").getJSONObject(0).getJSONArray("children").toString(2));
-////        JSONArray array = readJSON.getJsonObject().getJSONArray("return").getJSONObject(0).getJSONArray("children");
-////        System.out.println(readJSON.getJsonObject().getJSONArray("return").getJSONObject(0).getJSONArray("children").toString(2));
-//    }
-
-    public static void main(String[] args) throws IOException, JSONException, OntologyCreationException, InstantiationException, OntologyFormatStorageException, IllegalAccessException, OWLOntologyCreationException, OWLOntologyStorageException {
-        Engine engine = new Engine();
-        ReadJSON readJSON = new ReadJSON("ehealth-hardware.json");
-        engine.run(readJSON.getJsonObject().getJSONArray("children").toString());
-//      engine.xmlToOWL(readJSON.getJsonArray().toString());
+/**
+ * Copyright (c) 2013, Caixa Magica Software Lda (CMS).
+ * The work has been developed in the TIMBUS Project and the above-mentioned are Members of the TIMBUS Consortium.
+ * TIMBUS is supported by the European Union under the 7th Framework Programme for research and technological
+ * development and demonstration activities (FP7/2007-2013) under grant agreement no. 269940.
+ *
+ * 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, including without
+ * limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTIBITLY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law or agreed to in writing, shall any Contributor be liable for damages, including
+ * any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this
+ * License or out of the use or inability to use the Work.
+ * See the License for the specific language governing permissions and limitation under the License.
+ */
+public class TestConverter {
+    public static void main(String[] args) throws Exception {
+        LinuxHardwareConverter converter = new LinuxHardwareConverter();
+        ReadJSON readJSON = new ReadJSON("eHealth-hardware.json");
+//        JSONObject jsonObject = readJSON.getJsonObject().getJSONArray("children").getJSONObject(0);
+//        JSONObject jsonObject = readJSON.getJsonObject().getJSONArray("return").getJSONObject(0);
+//        System.out.println(readJSON.getJsonObject().getJSONArray("return").get(0));
+//        String result = converter.convert(readJSON.getJsonObject().getJSONArray("return").get(0).toString());
+        String result = converter.convert(readJSON.getJsonObject().getJSONObject("result").toString(2));
+//        System.out.println(result);
     }
 }