Author: dmacvicar Date: Mon Feb 4 22:58:14 2008 New Revision: 8464 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8464&view=rev Log: - remove xml store snif, this is emotional for me, it was the first piece of c++ code I wrote when joining SUSE. But the replacement is... nothing! what can be better than removing code by simplifying the concept. Added: branches/tmp/ma/jump_sat/libzypp/zypp/parser/xml_escape_parser.cpp - copied, changed from r8463, branches/tmp/ma/jump_sat/libzypp/zypp/target/store/xml_escape_parser.cpp branches/tmp/ma/jump_sat/libzypp/zypp/parser/xml_escape_parser.hpp - copied, changed from r8463, branches/tmp/ma/jump_sat/libzypp/zypp/target/store/xml_escape_parser.hpp Removed: branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLLanguageParser.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLLanguageParser.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLParserData.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLParserData.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLPatchParser.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLPatchParser.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLPatternParser.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLPatternParser.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLProductParser.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLProductParser.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLResObjectParser.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLResObjectParser.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/XMLSourceCacheParser.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/known-source.rnc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/known-source.rng branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/language.rnc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/language.rng branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/patch.rnc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/patch.rng branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/pattern.rnc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/pattern.rng branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/product.rnc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/product.rng branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/resolvable.rnc branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/resolvable.rng branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schema/rnc2rng branches/tmp/ma/jump_sat/libzypp/zypp/parser/xmlstore/schemanames.h branches/tmp/ma/jump_sat/libzypp/zypp/target/store/Backend.cc branches/tmp/ma/jump_sat/libzypp/zypp/target/store/Backend.h branches/tmp/ma/jump_sat/libzypp/zypp/target/store/PersistentStorage.cc branches/tmp/ma/jump_sat/libzypp/zypp/target/store/PersistentStorage.h branches/tmp/ma/jump_sat/libzypp/zypp/target/store/XMLFilesBackend.cc branches/tmp/ma/jump_sat/libzypp/zypp/target/store/XMLFilesBackend.h branches/tmp/ma/jump_sat/libzypp/zypp/target/store/parser_utils.hpp branches/tmp/ma/jump_sat/libzypp/zypp/target/store/serialize.cc branches/tmp/ma/jump_sat/libzypp/zypp/target/store/serialize.h branches/tmp/ma/jump_sat/libzypp/zypp/target/store/xml_escape_parser.cpp branches/tmp/ma/jump_sat/libzypp/zypp/target/store/xml_escape_parser.hpp Modified: branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt branches/tmp/ma/jump_sat/libzypp/zypp/cache/CacheInitializer.cc branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt?rev=8464&r1=8463&r2=8464&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt Mon Feb 4 22:58:14 2008 @@ -419,32 +419,6 @@ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/xml ) -SET( zypp_parser_xmlstore_SRCS - parser/xmlstore/XMLLanguageParser.cc - parser/xmlstore/XMLParserData.cc - parser/xmlstore/XMLPatchParser.cc - parser/xmlstore/XMLPatternParser.cc - parser/xmlstore/XMLProductParser.cc - parser/xmlstore/XMLResObjectParser.cc - parser/xmlstore/XMLSourceCacheParser.cc -) - -SET( zypp_parser_xmlstore_HEADERS - parser/xmlstore/XMLLanguageParser.h - parser/xmlstore/XMLParserData.h - parser/xmlstore/XMLPatchParser.h - parser/xmlstore/XMLPatternParser.h - parser/xmlstore/XMLProductParser.h - parser/xmlstore/XMLResObjectParser.h - parser/xmlstore/XMLSourceCacheParser.h - parser/xmlstore/schemanames.h -) - -INSTALL( FILES - ${zypp_parser_xmlstore_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/xmlstore -) - SET( zypp_parser_yum_SRCS parser/yum/RepoParser.cc parser/yum/FileReaderBaseImpl.cc @@ -646,28 +620,6 @@ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/rpm ) -SET( zypp_target_store_SRCS - target/store/Backend.cc - target/store/PersistentStorage.cc - target/store/XMLFilesBackend.cc - target/store/serialize.cc - target/store/xml_escape_parser.cpp -) - -SET( zypp_target_store_HEADERS - target/store/Backend.h - target/store/PersistentStorage.h - target/store/XMLFilesBackend.h - target/store/parser_utils.hpp - target/store/serialize.h - target/store/xml_escape_parser.hpp -) - -INSTALL( FILES - ${zypp_target_store_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/store -) - SET( zypp_thread_SRCS thread/Mutex.cc ) @@ -862,7 +814,6 @@ ${zypp_cache_sqlite3x_SRCS} ${zypp_pool_SRCS} ${zypp_parser_susetags_SRCS} -${zypp_parser_xmlstore_SRCS} ${zypp_parser_xml_SRCS} ${zypp_parser_yum_SRCS} ${zypp_parser_plaindir_SRCS} @@ -876,7 +827,6 @@ ${zypp_repo_yum_SRCS} ${zypp_repo_susetags_SRCS} ${zypp_repo_data_SRCS} -${zypp_target_store_SRCS} ${zypp_target_rpm_SRCS} ${zypp_target_hal_SRCS} ${zypp_target_modalias_SRCS} @@ -903,7 +853,6 @@ ${zypp_cache_HEADERS} ${zypp_cache_sqlite3x_HEADERS} ${zypp_ui_HEADERS} -${zypp_parser_xmlstore_HEADERS} ${zypp_media_HEADERS} ${zypp_target_hal_HEADERS} ${zypp_media_proxyinfo_HEADERS} @@ -911,7 +860,6 @@ ${zypp_solver_detail_HEADERS} ${zypp_sat_HEADERS} ${zypp_sat_detail_HEADERS} -${zypp_target_store_HEADERS} ${zypp_url_HEADERS} ${zypp_HEADERS} ${zypp_zypp_detail_HEADERS} @@ -943,7 +891,6 @@ #SET_LOGGROUP( "group" ${zypp_parser_yum2_SRCS} ) #SET_LOGGROUP( "group" ${zypp_capability_SRCS} ) #SET_LOGGROUP( "group" ${zypp_ui_SRCS} ) -#SET_LOGGROUP( "group" ${zypp_parser_xmlstore_SRCS} ) #SET_LOGGROUP( "group" ${zypp_data_SRCS} ) #SET_LOGGROUP( "group" ${zypp_media_SRCS} ) #SET_LOGGROUP( "group" ${zypp_target_hal_SRCS} ) @@ -953,7 +900,6 @@ #SET_LOGGROUP( "group" ${zypp_base_SRCS} ) #SET_LOGGROUP( "group" ${zypp_solver_detail_SRCS} ) #SET_LOGGROUP( "group" ${zypp_sat_SRCS} ) -#SET_LOGGROUP( "group" ${zypp_target_store_SRCS} ) #SET_LOGGROUP( "group" ${zypp_url_SRCS} ) #SET_LOGGROUP( "group" ${zypp_source_SRCS} ) #SET_LOGGROUP( "group" ${zypp_parser_SRCS} ) @@ -991,6 +937,3 @@ # install XML schemas FILE( GLOB YUM_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/yum/schema/*.rng ) INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum" ) - -FILE( GLOB XMLSTORE_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/xmlstore/schema/*.rng ) -INSTALL(FILES ${XMLSTORE_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/xmlstore" ) Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/CacheInitializer.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/cache/CacheInitializer.cc?rev=8464&r1=8463&r2=8464&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/cache/CacheInitializer.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/cache/CacheInitializer.cc Mon Feb 4 22:58:14 2008 @@ -15,7 +15,6 @@ #include "zypp/base/String.h" #include "zypp/base/Measure.h" #include "zypp/cache/CacheInitializer.h" -#include "zypp/target/store/PersistentStorage.h" #include "zypp/cache/Utils.h" #include "zypp/PathInfo.h" #include "sqlite-schema.h" Copied: branches/tmp/ma/jump_sat/libzypp/zypp/parser/xml_escape_parser.cpp (from r8463, branches/tmp/ma/jump_sat/libzypp/zypp/target/store/xml_escape_parser.cpp) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/parser/xml_escape_parser.cpp?p2=branches/tmp/ma/jump_sat/libzypp/zypp/parser/xml_escape_parser.cpp&p1=branches/tmp/ma/jump_sat/libzypp/zypp/target/store/xml_escape_parser.cpp&r1=8463&r2=8464&rev=8464&view=diff ============================================================================== (empty) Copied: branches/tmp/ma/jump_sat/libzypp/zypp/parser/xml_escape_parser.hpp (from r8463, branches/tmp/ma/jump_sat/libzypp/zypp/target/store/xml_escape_parser.hpp) URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/parser/xml_escape_parser.hpp?p2=branches/tmp/ma/jump_sat/libzypp/zypp/parser/xml_escape_parser.hpp&p1=branches/tmp/ma/jump_sat/libzypp/zypp/target/store/xml_escape_parser.hpp&r1=8463&r2=8464&rev=8464&view=diff ============================================================================== (empty) Modified: branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc?rev=8464&r1=8463&r2=8464&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc Mon Feb 4 22:58:14 2008 @@ -22,7 +22,7 @@ #include "zypp/Product.h" #include "zypp/Package.h" #include "zypp/Edition.h" -#include "zypp/target/store/xml_escape_parser.hpp" +#include "zypp/parser/xml_escape_parser.hpp" #include "zypp/base/String.h" #include "zypp/base/PtrTypes.h" #include "zypp/Capabilities.h" Modified: branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h?rev=8464&r1=8463&r2=8464&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/target/TargetImpl.h Mon Feb 4 22:58:14 2008 @@ -28,7 +28,6 @@ #include "zypp/media/MediaAccess.h" #include "zypp/Target.h" #include "zypp/target/rpm/RpmDb.h" -#include "zypp/target/store/PersistentStorage.h" #include "zypp/target/TargetException.h" /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org