|
From: <chr...@us...> - 2012-02-21 19:11:09
|
Revision: 3559
http://dlvhex.svn.sourceforge.net/dlvhex/?rev=3559&view=rev
Author: chrisr86
Date: 2012-02-21 19:10:59 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
port to 2x trunk
Modified Paths:
--------------
dlvhex-dlplugin/branches/release2x/include/Answer.h
dlvhex-dlplugin/branches/release2x/include/AtomSeparator.h
dlvhex-dlplugin/branches/release2x/include/Cache.h
dlvhex-dlplugin/branches/release2x/include/DFConverter.h
dlvhex-dlplugin/branches/release2x/include/DFOutputBuilder.h
dlvhex-dlplugin/branches/release2x/include/DLQuery.h
dlvhex-dlplugin/branches/release2x/include/Default.h
dlvhex-dlplugin/branches/release2x/include/HexDLConverter.h
dlvhex-dlplugin/branches/release2x/include/HexDLDriver.h
dlvhex-dlplugin/branches/release2x/include/HexDLRewriter.h
dlvhex-dlplugin/branches/release2x/include/Ontology.h
dlvhex-dlplugin/branches/release2x/include/QueryCtx.h
dlvhex-dlplugin/branches/release2x/include/RacerExtAtom.tcc
dlvhex-dlplugin/branches/release2x/include/RacerInterface.h
dlvhex-dlplugin/branches/release2x/include/RacerQueryExpr.h
dlvhex-dlplugin/branches/release2x/src/Answer.cpp
dlvhex-dlplugin/branches/release2x/src/DLQuery.cpp
dlvhex-dlplugin/branches/release2x/src/HexDLConverter.cpp
dlvhex-dlplugin/branches/release2x/src/HexDLRewriter.cpp
dlvhex-dlplugin/branches/release2x/src/Query.cpp
dlvhex-dlplugin/branches/release2x/src/RacerBuilder.cpp
dlvhex-dlplugin/branches/release2x/src/RacerQueryExpr.cpp
dlvhex-dlplugin/branches/release2x/src/URI.cpp
Modified: dlvhex-dlplugin/branches/release2x/include/Answer.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/Answer.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/Answer.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -33,7 +33,7 @@
#ifndef _ANSWER_H
#define _ANSWER_H
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <string>
#include <iosfwd>
Modified: dlvhex-dlplugin/branches/release2x/include/AtomSeparator.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/AtomSeparator.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/AtomSeparator.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -36,7 +36,7 @@
#include "DLError.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <string>
#include <vector>
Modified: dlvhex-dlplugin/branches/release2x/include/Cache.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/Cache.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/Cache.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -36,7 +36,7 @@
#include "QueryCtx.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <set>
#include <iosfwd>
Modified: dlvhex-dlplugin/branches/release2x/include/DFConverter.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/DFConverter.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/DFConverter.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -1,7 +1,7 @@
#ifndef _DLVHEX_DF_DFCONVERTER_H_
#define _DLVHEX_DF_DFCONVERTER_H_
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include "Ontology.h"
#include "DFProcessor.h"
#include "Registry.h"
Modified: dlvhex-dlplugin/branches/release2x/include/DFOutputBuilder.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/DFOutputBuilder.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/DFOutputBuilder.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -40,7 +40,7 @@
//#include "dlvhex/ResultContainer.h"
#include "DFProcessor.h"
-#include "dlvhex/ComfortPluginInterface.hpp"
+#include "dlvhex2/ComfortPluginInterface.h"
namespace dlvhex {
Modified: dlvhex-dlplugin/branches/release2x/include/DLQuery.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/DLQuery.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/DLQuery.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -35,8 +35,8 @@
#include "Ontology.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
-#include <dlvhex/Registry.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
+#include <dlvhex2/Registry.h>
#include <iosfwd>
#include <iterator>
Modified: dlvhex-dlplugin/branches/release2x/include/Default.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/Default.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/Default.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -33,7 +33,7 @@
#define _DLVHEX_DF_DEFAULT_H_
#include <list>
-#include <dlvhex/PluginInterface.h>
+#include <dlvhex2/PluginInterface.h>
#include "Defaults.h"
#include "DLRules.h"
#include "Pred2Dim.h"
Modified: dlvhex-dlplugin/branches/release2x/include/HexDLConverter.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/HexDLConverter.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/HexDLConverter.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -11,8 +11,8 @@
#include "Ontology.h"
-#include <dlvhex/Registry.hpp>
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/Registry.h>
+#include <dlvhex2/ComfortPluginInterface.h>
namespace dlvhex {
namespace dl {
Modified: dlvhex-dlplugin/branches/release2x/include/HexDLDriver.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/HexDLDriver.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/HexDLDriver.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -38,7 +38,7 @@
#include "Ontology.h"
#include "DLError.h"
-#include <dlvhex/PluginInterface.h>
+#include <dlvhex2/PluginInterface.h>
#include <iosfwd>
#include <string>
Modified: dlvhex-dlplugin/branches/release2x/include/HexDLRewriter.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/HexDLRewriter.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/HexDLRewriter.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -41,8 +41,8 @@
#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_deque.hpp>
-#include <dlvhex/ComfortPluginInterface.hpp>
-#include <dlvhex/Rule.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
+#include <dlvhex2/Rule.h>
namespace dlvhex {
namespace dl {
Modified: dlvhex-dlplugin/branches/release2x/include/Ontology.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/Ontology.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/Ontology.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -36,7 +36,7 @@
#include "URI.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <iostream>
#include <string>
Modified: dlvhex-dlplugin/branches/release2x/include/QueryCtx.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/QueryCtx.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/QueryCtx.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -37,7 +37,7 @@
#include "DLError.h"
#include "Query.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <boost/shared_ptr.hpp>
Modified: dlvhex-dlplugin/branches/release2x/include/RacerExtAtom.tcc
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/RacerExtAtom.tcc 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/RacerExtAtom.tcc 2012-02-21 19:10:59 UTC (rev 3559)
@@ -45,8 +45,8 @@
#include "RacerNRQL.h"
#include "RacerNRQLBuilder.h"
-#include <dlvhex/Error.h>
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/Error.h>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <boost/shared_ptr.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
Modified: dlvhex-dlplugin/branches/release2x/include/RacerInterface.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/RacerInterface.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/RacerInterface.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -33,7 +33,7 @@
#ifndef _RACERINTERFACE_H
#define _RACERINTERFACE_H
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include "Ontology.h"
#include "DFConverter.h"
#include "DFOutputBuilder.h"
Modified: dlvhex-dlplugin/branches/release2x/include/RacerQueryExpr.h
===================================================================
--- dlvhex-dlplugin/branches/release2x/include/RacerQueryExpr.h 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/include/RacerQueryExpr.h 2012-02-21 19:10:59 UTC (rev 3559)
@@ -33,8 +33,8 @@
#ifndef _RACERQUERYEXPR_H
#define _RACERQUERYEXPR_H
-#include <dlvhex/Term.hpp>
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/Term.h>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
Modified: dlvhex-dlplugin/branches/release2x/src/Answer.cpp
===================================================================
--- dlvhex-dlplugin/branches/release2x/src/Answer.cpp 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/src/Answer.cpp 2012-02-21 19:10:59 UTC (rev 3559)
@@ -35,7 +35,7 @@
#include "Query.h"
#include "URI.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <string>
#include <iterator>
Modified: dlvhex-dlplugin/branches/release2x/src/DLQuery.cpp
===================================================================
--- dlvhex-dlplugin/branches/release2x/src/DLQuery.cpp 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/src/DLQuery.cpp 2012-02-21 19:10:59 UTC (rev 3559)
@@ -32,7 +32,7 @@
#include "DLQuery.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
namespace dlvhex {
Modified: dlvhex-dlplugin/branches/release2x/src/HexDLConverter.cpp
===================================================================
--- dlvhex-dlplugin/branches/release2x/src/HexDLConverter.cpp 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/src/HexDLConverter.cpp 2012-02-21 19:10:59 UTC (rev 3559)
@@ -39,7 +39,7 @@
#include "HexDLConverter.h"
#include "HexDLRewriter.h"
#include "Ontology.h"
-#include <dlvhex/Error.h>
+#include <dlvhex2/Error.h>
#include <boost/config/warning_disable.hpp>
#include <boost/spirit/include/lex_lexertl.hpp>
Modified: dlvhex-dlplugin/branches/release2x/src/HexDLRewriter.cpp
===================================================================
--- dlvhex-dlplugin/branches/release2x/src/HexDLRewriter.cpp 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/src/HexDLRewriter.cpp 2012-02-21 19:10:59 UTC (rev 3559)
@@ -34,7 +34,7 @@
#include "AtomSeparator.h"
#include "DLError.h"
-#include <dlvhex/Error.h>
+#include <dlvhex2/Error.h>
#include <iosfwd>
#include <iterator>
Modified: dlvhex-dlplugin/branches/release2x/src/Query.cpp
===================================================================
--- dlvhex-dlplugin/branches/release2x/src/Query.cpp 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/src/Query.cpp 2012-02-21 19:10:59 UTC (rev 3559)
@@ -34,9 +34,9 @@
#include "Query.h"
#include "KBManager.h"
-#include <dlvhex/Atoms.hpp>
+#include <dlvhex2/Atoms.h>
//#include <dlvhex/AtomSet.h>
-#include <dlvhex/Term.hpp>
+#include <dlvhex2/Term.h>
namespace dlvhex {
namespace dl {
Modified: dlvhex-dlplugin/branches/release2x/src/RacerBuilder.cpp
===================================================================
--- dlvhex-dlplugin/branches/release2x/src/RacerBuilder.cpp 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/src/RacerBuilder.cpp 2012-02-21 19:10:59 UTC (rev 3559)
@@ -36,7 +36,7 @@
#include "RacerNRQLBuilder.h"
#include "Query.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <sstream>
#include <iostream>
Modified: dlvhex-dlplugin/branches/release2x/src/RacerQueryExpr.cpp
===================================================================
--- dlvhex-dlplugin/branches/release2x/src/RacerQueryExpr.cpp 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/src/RacerQueryExpr.cpp 2012-02-21 19:10:59 UTC (rev 3559)
@@ -32,8 +32,8 @@
#include "RacerQueryExpr.h"
#include "URI.h"
-#include <dlvhex/Term.hpp>
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/Term.h>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <iosfwd>
#include <string>
Modified: dlvhex-dlplugin/branches/release2x/src/URI.cpp
===================================================================
--- dlvhex-dlplugin/branches/release2x/src/URI.cpp 2012-02-21 19:10:46 UTC (rev 3558)
+++ dlvhex-dlplugin/branches/release2x/src/URI.cpp 2012-02-21 19:10:59 UTC (rev 3559)
@@ -33,7 +33,7 @@
#include "URI.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
#include <string>
#include <algorithm>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|