Hello community,
here is the log from the commit of package openwsman for openSUSE:Factory checked in at 2012-02-02 17:58:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openwsman (Old)
and /work/SRC/openSUSE:Factory/.openwsman.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openwsman", Maintainer is "PRusnak@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openwsman/openwsman.changes 2011-09-23 12:21:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openwsman.new/openwsman.changes 2012-02-02 17:58:55.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Jan 24 22:08:27 UTC 2012 - joop.boonen@opensuse.org
+
+- Corrected the license
+- Corrected the formating according to the openSUSE standard
+
+-------------------------------------------------------------------
+Tue Dec 6 08:40:18 UTC 2011 - aj@suse.de
+
+- Do not package files twice.
+
+-------------------------------------------------------------------
@@ -17 +28 @@
- - Bugfix (all by Matthias Bolte)
+ - Bugfixes
@@ -18,0 +30 @@
+ (Matthias Bolte)
@@ -19,0 +32,3 @@
+ (Matthias Bolte)
+ - Fix recognition of ntlm and gss-negotiate auth methods when checking
+ server-requested vs. client-offered methods.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openwsman.spec ++++++
--- /var/tmp/diff_new_pack.lVSXk1/_old 2012-02-02 17:58:58.000000000 +0100
+++ /var/tmp/diff_new_pack.lVSXk1/_new 2012-02-02 17:58:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openwsman
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,29 +15,36 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: openwsman
-BuildRequires: gcc-c++ swig >= 1.3.30
-BuildRequires: libxml2-devel pam-devel sblim-sfcc-devel
BuildRequires: cmake
-
-BuildRequires: java-devel perl python-devel
+BuildRequires: gcc-c++
+BuildRequires: libxml2-devel
+BuildRequires: pam-devel
+BuildRequires: sblim-sfcc-devel
+BuildRequires: swig >= 1.3.30
+
+BuildRequires: java-devel
+BuildRequires: perl
+BuildRequires: python-devel
%if 0%{?rhel_version} > 0
BuildRequires: -vim
%endif
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel}
-BuildRequires: curl-devel openssl-devel pkgconfig ruby ruby-devel ruby-rdoc
+BuildRequires: curl-devel
+BuildRequires: openssl-devel
+BuildRequires: pkgconfig
+BuildRequires: ruby
+BuildRequires: ruby-devel
+BuildRequires: ruby-rdoc
%if 0%{?fedora} > 0
BuildRequires: perl-devel
%endif
%endif
%if 0%{?suse_version} > 0
-
# No jni_md.h on SLE10 :-/
#%if 0%{?suse_version} < 1100
#BuildRequires: java-1_5_0-ibm-devel
@@ -46,11 +53,13 @@
#%endif
%if 0%{?suse_version} > 1010
-BuildRequires: fdupes libopenssl-devel
+BuildRequires: fdupes
+BuildRequires: libopenssl-devel
BuildRequires: libcurl-devel
%else
# SLE10
-BuildRequires: libidn-devel openssl-devel
+BuildRequires: libidn-devel
+BuildRequires: openssl-devel
BuildRequires: curl-devel
%endif
@@ -59,20 +68,21 @@
BuildRequires: pkg-config
%else
# SLE9
-BuildRequires: pkgconfig ruby
+BuildRequires: pkgconfig
+BuildRequires: ruby
%endif
%endif
Requires(pre): sed coreutils grep /bin/hostname
Version: 2.2.7
-Release: 1
+Release: 0
# Mandriva:
# Release %mkrel 1
Url: http://www.openwsman.org/
-License: BSD3c(or similar)
-Group: System/Management
Summary: Opensource Implementation of WS-Management
+License: BSD-3-Clause
+Group: System/Management
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.rpmlintrc
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel}
@@ -86,38 +96,22 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Opensource Implementation of WS-Management
+Opensource Implementation of WS-Management protocol stack
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
-
%package -n libwsman1
-License: BSD3c(or similar)
-Group: System/Management
Summary: Opensource Implementation of WS-Management
+Group: System/Management
Provides: openwsman = %{version}
Obsoletes: openwsman < %{version}
%description -n libwsman1
-Opensource Implementation of WS-Management
-
-
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
+Opensource Implementation of WS-Management protocol stack
+(Common libraries)
%package -n libwsman-devel
-License: BSD3c(or similar)
-Group: Development/Libraries/C and C++
Summary: Opensource Implementation of WS-Management
+Group: Development/Libraries/C and C++
Provides: openwsman-devel = %{version}
Obsoletes: openwsman-devel < %{version}
Requires: libwsman1 = %{version}
@@ -125,20 +119,12 @@
Requires: sblim-sfcc-devel libxml2-devel pam-devel
%description -n libwsman-devel
-Opensource Implementation of WS-Management
-
-
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
+Opensource Implementation of WS-Management stack
+(Development files)
%package -n libwsman_clientpp1
-License: BSD3c(or similar)
-Group: System/Management
Summary: C++ bindings to Openwsman Client libraries
+Group: System/Management
Provides: openwsman-client = %{version}
Obsoletes: openwsman-client < %{version}
@@ -146,17 +132,9 @@
An implementation of the WsmanClient interface using C++
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
-
%package -n libwsman_clientpp-devel
-License: BSD3c(or similar)
-Group: System/Management
Summary: C++ bindings to Openwsman Client libraries
+Group: System/Management
Requires: libwsman_clientpp1 = %{version}
Requires: libwsman-devel = %{version}
@@ -164,38 +142,21 @@
Development files for C++ interface to OpenWSMAN client library.
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
-
%package server
-License: BSD3c(or similar)
-Group: System/Management
Requires(pre): sed coreutils grep diffutils /bin/hostname
%if 0%{?suse_version}
Requires(pre): fillup
%endif
Summary: Openwsman Server and service libraries
+Group: System/Management
%description server
Openwsman Server and service libraries
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
-
-
%package python
-License: BSD3c(or similar)
-Group: Development/Libraries/Python
Summary: Python bindings for openwsman client API
+Group: Development/Libraries/Python
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?py_requires: %define py_requires Requires: python}
@@ -206,14 +167,7 @@
API.
-
-Authors:
---------
- Klaus Kaempf
-
%package ruby
-License: BSD3c(or similar)
-Group: System/Management
Requires: ruby
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel}
Requires: ruby(abi) = 1.8
@@ -226,52 +180,37 @@
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad = Config::CONFIG["vendorarchdir"]; print(vad ? vad : Config::CONFIG["sitearchdir"])')}
%endif
Summary: Ruby bindings for openwsman client API
+Group: System/Management
%description ruby
This package provides Ruby bindings to access the openwsman client API.
-
-Authors:
---------
- Klaus Kaempf
-
%package perl
-License: BSD3c(or similar)
-Group: System/Management
%if 0%{?fedora}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
Requires: perl = %{perl_version}
%endif
Summary: Perl bindings for openwsman client API
+Group: System/Management
%description perl
This package provides Perl bindings to access the openwsman client API.
-
-Authors:
---------
- Klaus Kaempf
-
%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1100
%package java
-License: BSD3c(or similar)
-Group: System/Management
Requires: java
Requires: libwsman1 = %{version}
Summary: Java bindings for openwsman client API
+Group: System/Management
%description java
This package provides Java bindings to access the openwsman client API.
-
-Authors:
---------
- Klaus Kaempf
%endif
%prep
@@ -324,9 +263,6 @@
install -D -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openwsman
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -n libwsman1 -p /sbin/ldconfig
%postun -n libwsman1 -p /sbin/ldconfig
@@ -373,6 +309,8 @@
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
+%exclude %{_includedir}/openwsman/cpp/*.h
+%exclude %{_libdir}/libwsman_clientpp.so
%files python
%defattr(-,root,root)
@@ -381,19 +319,15 @@
%files ruby
%defattr(-,root,root)
-%if 0%{?suse_version}
-%{ruby_sitearch}/openwsman.so
-%dir %{ruby_sitelib}/openwsman
-%{ruby_sitelib}/openwsman/*.rb
-%endif
%if 0%{?mandriva_version}
-%{ruby_sitearchdir}/openwsman.so
+%{ruby_sitearchdir}/_openwsman.so
%dir %{ruby_sitelibdir}/openwsman
+%{ruby_sitelibdir}/openwsman.rb
%{ruby_sitelibdir}/openwsman/*.rb
-%endif
-%if 0%{?fedora} > 0 || 0%{?rhel_version} > 0
-%{ruby_sitearch}/openwsman.so
+%else
+%{ruby_sitearch}/_openwsman.so
%dir %{ruby_sitelib}/openwsman
+%{ruby_sitelib}/openwsman.rb
%{ruby_sitelib}/openwsman/*.rb
%endif
++++++ openwsman-2.2.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/AUTHORS new/openwsman-2.2.7/AUTHORS
--- old/openwsman-2.2.7/AUTHORS 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/AUTHORS 2011-09-21 10:25:09.000000000 +0200
@@ -1,19 +1,25 @@
-
Maintainer:
- Anas Nashif, Intel Corp.
+ Klaus Kaempf, SUSE,
Developers:
- Anas Nashif, Intel Corp.
+ Anas Nashif, Intel Corp.,
Hou Liang, Intel Corp.
- Vadim Revyakin, Intel Corp.
- Denis Sadykov, Intel Corp.
+ Vadim Revyakin, Intel Corp.,
+ Denis Sadykov, Intel Corp.,
Code originally from:
Eugene Yarmosh, Intel Corp.
Contributions and Patches by:
- Viktor Mihajlovski, IBM
- Klaus Kaempf, Novell
-
+ Jan Blunck, Novell,
+ Matthias Bolte
+ Vitezslav Crhonek, Redhat,
+ Klaus Kaempf, Novell,
+ Viktor Mihajlovski, IBM,
+ Praveen Paladugu, Dell,
+ Chris Poblete, Dell,
+ Till Steinbach
+ Suresh Sundriyal, VMware,
+ Srinivas Thirumalaa
If you think you name should be here and I forgot it, please let me know.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/ChangeLog new/openwsman-2.2.7/ChangeLog
--- old/openwsman-2.2.7/ChangeLog 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/ChangeLog 2011-09-21 10:25:09.000000000 +0200
@@ -1,7 +1,8 @@
2.2.7
- Features
- - Rename openwsman-client to openwsman-client-c++ since it only
- includes C++ bindings. Move openwsman_client.conf to libwsman1.
+ - Rename openwsman-client to libwsman_clientpp since it only
+ includes C++ bindings. Split off libwsman_clientpp-devel.
+ Move openwsman_client.conf to libwsman1.
- Performance improvements for Enum (optimized) and Pull requests
(Srinivas Thirumalaa)
- Bindings
@@ -10,9 +11,13 @@
- Add max_elements, max_envelope_size, fragment, and timeout
to Options
- Use optimized enumeration in tests
-- Bugfix (all by Matthias Bolte)
+- Bugfixes
- Fix memory leaks in wsmc_action_enumerate_and_pull and wsmc_release
+ (Matthias Bolte)
- Fix possible corruption in ws_serializer_free_mem
+ (Matthias Bolte)
+ - Fix recognition of ntlm and gss-negotiate auth methods when checking
+ server-requested vs. client-offered methods.
- Developer
- Enable client tests
- Improve Windows build (Matthias Bolte)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/openwsman.i new/openwsman-2.2.7/bindings/openwsman.i
--- old/openwsman-2.2.7/bindings/openwsman.i 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/openwsman.i 2011-09-21 10:25:09.000000000 +0200
@@ -133,6 +133,11 @@
#include
#if defined(SWIGRUBY)
#include
+
+SWIGEXPORT void Init_openwsman(void);
+SWIGEXPORT void Init__openwsman(void) {
+ Init_openwsman();
+}
#endif
#if defined(SWIGPYTHON)
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/python/tests/client.py new/openwsman-2.2.7/bindings/python/tests/client.py
--- old/openwsman-2.2.7/bindings/python/tests/client.py 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/python/tests/client.py 2011-09-21 10:25:09.000000000 +0200
@@ -1,4 +1,12 @@
import unittest
+import sys
+
+# automake build dir
+sys.path.insert(0, '..')
+sys.path.insert(0, '../.libs')
+# cmake build dir
+sys.path.insert(0, '../../../build/bindings/python')
+
from pywsman import *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/CMakeLists.txt new/openwsman-2.2.7/bindings/ruby/CMakeLists.txt
--- old/openwsman-2.2.7/bindings/ruby/CMakeLists.txt 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/CMakeLists.txt 2011-09-21 10:25:09.000000000 +0200
@@ -39,7 +39,7 @@
ADD_LIBRARY( rbwsman SHARED ${rbwsman_SRCS} )
# prevent 'lib...'
SET_TARGET_PROPERTIES( rbwsman PROPERTIES PREFIX "" )
-SET_TARGET_PROPERTIES( rbwsman PROPERTIES OUTPUT_NAME "openwsman" )
+SET_TARGET_PROPERTIES( rbwsman PROPERTIES OUTPUT_NAME "_openwsman" )
INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} )
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
@@ -52,12 +52,14 @@
# copy .so file to ARCH_DIR
INSTALL(TARGETS rbwsman LIBRARY DESTINATION ${RUBY_WSMAN_ARCH_DIR})
-# copy openwsman/*.rb to LIB_DIR
+# copy openwsman/*.rb to LIB_DIR/openwsman/*.rb
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/openwsman DESTINATION ${RUBY_WSMAN_LIB_DIR}
PATTERN ".rb"
PATTERN ".svn" EXCLUDE
PATTERN "Makefile.am" EXCLUDE)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openwsman.rb DESTINATION ${RUBY_WSMAN_LIB_DIR})
+
# rdoc
SET(rdoc_dir "${CMAKE_CURRENT_BINARY_DIR}/html")
ADD_CUSTOM_COMMAND (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/openwsman/openwsman.rb new/openwsman-2.2.7/bindings/ruby/openwsman/openwsman.rb
--- old/openwsman-2.2.7/bindings/ruby/openwsman/openwsman.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/openwsman/openwsman.rb 2011-09-21 10:25:09.000000000 +0200
@@ -3,9 +3,8 @@
# require 'openwsman/openwsman'
#
-
# this loads the binary .so file
-require 'openwsman'
+require '_openwsman'
# this extends Openwsman::XmlNode with method_missing
require 'openwsman/xmlnode'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/openwsman.rb new/openwsman-2.2.7/bindings/ruby/openwsman.rb
--- old/openwsman-2.2.7/bindings/ruby/openwsman.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/openwsman-2.2.7/bindings/ruby/openwsman.rb 2011-09-21 10:25:09.000000000 +0200
@@ -0,0 +1,4 @@
+# This is openwsman.rb
+#
+
+require 'openwsman/openwsman'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/_loadpath.rb new/openwsman-2.2.7/bindings/ruby/tests/_loadpath.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/_loadpath.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/openwsman-2.2.7/bindings/ruby/tests/_loadpath.rb 2011-09-21 10:25:09.000000000 +0200
@@ -0,0 +1,8 @@
+# Autotools binary
+$:.unshift "../.libs"
+
+# cmake binary
+$:.unshift "../../../build/bindings/ruby"
+
+# cmake local for openwsman.rb
+$:.unshift ".."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/anon-identify.rb new/openwsman-2.2.7/bindings/ruby/tests/anon-identify.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/anon-identify.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/anon-identify.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# test identify action
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
require 'auth-callback'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/auth-callback.rb new/openwsman-2.2.7/bindings/ruby/tests/auth-callback.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/auth-callback.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/auth-callback.rb 2011-09-21 10:25:09.000000000 +0200
@@ -6,7 +6,7 @@
class Transport
def Transport.auth_request_callback( client, auth_type )
puts "Transport.auth_request_callback( #{client}, #{auth_type} )"
- puts Transport.auth_name( 1 )
+ puts Transport.auth_name( auth_type )
puts "#{Transport.auth_name( auth_type )} authentication failed for #{client.host}"
print "Username:"
STDOUT.flush
@@ -14,8 +14,7 @@
print "Password:"
STDOUT.flush
password = STDIN.gets.chomp
- return [ username, password ] if auth_type == BASIC_AUTH
- return nil # abort, if non-basic auth
+ return [ username, password ]
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/cim_computer_system.rb new/openwsman-2.2.7/bindings/ruby/tests/cim_computer_system.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/cim_computer_system.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/cim_computer_system.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,11 +1,9 @@
# cim_computer_system.rb
# enumerate/pull/release for CIM_ComputerSystem
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/cim_enumerate_all.rb new/openwsman-2.2.7/bindings/ruby/tests/cim_enumerate_all.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/cim_enumerate_all.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/cim_enumerate_all.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,11 +1,9 @@
# cim_enumerate_classnames.rb
# test EnumerateClassnames CIM extension
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/cim_enumerate_classnames.rb new/openwsman-2.2.7/bindings/ruby/tests/cim_enumerate_classnames.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/cim_enumerate_classnames.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/cim_enumerate_classnames.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,11 +1,9 @@
# cim_enumerate_classnames.rb
# test EnumerateClassnames CIM extension
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/cim_get_class.rb new/openwsman-2.2.7/bindings/ruby/tests/cim_get_class.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/cim_get_class.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/cim_get_class.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,11 +1,9 @@
# cim_get_class.rb
# invoke/GetClass for CIM_ComputerSystem
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/cim_operating_system.rb new/openwsman-2.2.7/bindings/ruby/tests/cim_operating_system.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/cim_operating_system.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/cim_operating_system.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,11 +1,9 @@
# cim_computer_system.rb
# enumerate/pull/release for CIM_OperatingSystem
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/cim_process.rb new/openwsman-2.2.7/bindings/ruby/tests/cim_process.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/cim_process.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/cim_process.rb 2011-09-21 10:25:09.000000000 +0200
@@ -3,13 +3,10 @@
#
#
-$:.unshift File.join(File.dirname(__FILE__), "../../../bindings/ruby")
-$:.unshift File.join(File.dirname(__FILE__), "../../../build/bindings/ruby")
-$:.unshift File.join(File.dirname(__FILE__), "../.libs")
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require File.join(File.dirname(__FILE__), '_client')
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/cim_system_configuration.rb new/openwsman-2.2.7/bindings/ruby/tests/cim_system_configuration.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/cim_system_configuration.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/cim_system_configuration.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,13 +1,10 @@
# cim_computer_system.rb
# enumerate/pull/release for CIM_SystemConfiguration
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/classes.rb new/openwsman-2.2.7/bindings/ruby/tests/classes.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/classes.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/classes.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,13 +1,10 @@
# test classes of extension
require 'test/unit'
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-$:.unshift ".."
-
class LoadTest < Test::Unit::TestCase
def test_loading
- require 'openwsman/openwsman'
+ require '_loadpath'
+ require 'openwsman'
Openwsman.constants.sort.each do |c|
next if c == c.upcase
puts c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/client.rb new/openwsman-2.2.7/bindings/ruby/tests/client.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/client.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/client.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# test client class
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class ClientTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/client_bad.rb new/openwsman-2.2.7/bindings/ruby/tests/client_bad.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/client_bad.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/client_bad.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# client.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/clientoptions.rb new/openwsman-2.2.7/bindings/ruby/tests/clientoptions.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/clientoptions.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/clientoptions.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# test ClientOptions class
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class ClientOptionsTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/clients.yml new/openwsman-2.2.7/bindings/ruby/tests/clients.yml
--- old/openwsman-2.2.7/bindings/ruby/tests/clients.yml 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/clients.yml 2011-09-21 10:25:09.000000000 +0200
@@ -5,7 +5,15 @@
path: /wsman
username:
password:
-
+
+windows8:
+ scheme: https
+ host: 10.10.103.88
+ port: 5985
+ path: /wsman
+ username: wsman
+ password: secret
+
xp:
scheme: http
host: 10.10.100.66
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/constants.rb new/openwsman-2.2.7/bindings/ruby/tests/constants.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/constants.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/constants.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,11 +1,8 @@
# test defined constants
-$:.unshift ".."
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
class ConstantTest < Test::Unit::TestCase
def test_constants
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/create.rb new/openwsman-2.2.7/bindings/ruby/tests/create.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/create.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/create.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# create.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/debug.rb new/openwsman-2.2.7/bindings/ruby/tests/debug.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/debug.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/debug.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# client.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/each_child.rb new/openwsman-2.2.7/bindings/ruby/tests/each_child.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/each_child.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/each_child.rb 2011-09-21 10:25:09.000000000 +0200
@@ -5,13 +5,10 @@
#
#
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/enumerate.rb new/openwsman-2.2.7/bindings/ruby/tests/enumerate.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/enumerate.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/enumerate.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# enumerate.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/enumerate_class_names.rb new/openwsman-2.2.7/bindings/ruby/tests/enumerate_class_names.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/enumerate_class_names.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/enumerate_class_names.rb 2011-09-21 10:25:09.000000000 +0200
@@ -2,13 +2,10 @@
# Tests an openwsman 2.2 extension: Intrinsic WBEM operations via 'invoke'
#
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/epr.rb new/openwsman-2.2.7/bindings/ruby/tests/epr.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/epr.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/epr.rb 2011-09-21 10:25:09.000000000 +0200
@@ -2,10 +2,8 @@
# test end point reference
#
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class LoadTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/exec_cmd.rb new/openwsman-2.2.7/bindings/ruby/tests/exec_cmd.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/exec_cmd.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/exec_cmd.rb 2011-09-21 10:25:09.000000000 +0200
@@ -3,13 +3,10 @@
# Test Linux_OperatingSystem.execCmd of sblim-cmpi-base
#
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-$:.unshift ".."
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/fault.rb new/openwsman-2.2.7/bindings/ruby/tests/fault.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/fault.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/fault.rb 2011-09-21 10:25:09.000000000 +0200
@@ -3,12 +3,9 @@
# Test WsManFault bindings
#
-$:.unshift File.join(File.dirname(__FILE__), "..","..","..","build","bindings","ruby")
-$:.unshift File.join(File.dirname(__FILE__), "..",".libs")
-$:.unshift File.join(File.dirname(__FILE__), "..")
-
require 'test/unit'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
class WsmanTest < Test::Unit::TestCase
def test_fault
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/get.rb new/openwsman-2.2.7/bindings/ruby/tests/get.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/get.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/get.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# get.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/get_class.rb new/openwsman-2.2.7/bindings/ruby/tests/get_class.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/get_class.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/get_class.rb 2011-09-21 10:25:09.000000000 +0200
@@ -2,13 +2,10 @@
# Tests an openwsman 2.2 extension: Intrinsic WBEM operations via 'invoke'
#
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/identify.rb new/openwsman-2.2.7/bindings/ruby/tests/identify.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/identify.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/identify.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,17 +1,17 @@
# test identify action
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-$:.unshift ".."
-
+$: << File.dirname(__FILE__)
require 'test/unit'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
+require 'auth-callback'
+require '_client'
class IdentifyTest < Test::Unit::TestCase
def test_identify
Openwsman::debug = 1
- client = Openwsman::Client.new( "http://wsman:secret@localhost:5985/wsman" )
+ client = Client.open
assert client
client.transport.auth_method = Openwsman::BASIC_AUTH_STR
options = Openwsman::ClientOptions.new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/invoke.rb new/openwsman-2.2.7/bindings/ruby/tests/invoke.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/invoke.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/invoke.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# invoke.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/loading.rb new/openwsman-2.2.7/bindings/ruby/tests/loading.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/loading.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/loading.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,11 +1,10 @@
# test loading of extension
require 'test/unit'
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
class LoadTest < Test::Unit::TestCase
def test_loading
+ require '_loadpath'
require 'openwsman'
assert true
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/notepad.rb new/openwsman-2.2.7/bindings/ruby/tests/notepad.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/notepad.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/notepad.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# invoke.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/nsconsts.rb new/openwsman-2.2.7/bindings/ruby/tests/nsconsts.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/nsconsts.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/nsconsts.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# nsconsts.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class NsConstsTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/pull.rb new/openwsman-2.2.7/bindings/ruby/tests/pull.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/pull.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/pull.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# enumerate.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/put.rb new/openwsman-2.2.7/bindings/ruby/tests/put.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/put.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/put.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# put.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/rbwsman.rb new/openwsman-2.2.7/bindings/ruby/tests/rbwsman.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/rbwsman.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/rbwsman.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,4 +1,5 @@
module Openwsman
+ require '_loadpath'
require 'openwsman'
include Openwsman
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/release.rb new/openwsman-2.2.7/bindings/ruby/tests/release.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/release.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/release.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# release.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/status.rb new/openwsman-2.2.7/bindings/ruby/tests/status.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/status.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/status.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,10 +1,8 @@
# status.rb
# Test WsmanStatus
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/subscribe.rb new/openwsman-2.2.7/bindings/ruby/tests/subscribe.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/subscribe.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/subscribe.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,13 +1,10 @@
# subscribe.rb
# generate listing 9 of http://www.ibm.com/developerworks/webservices/library/ws-CIM/index.html
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require 'auth-callback'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/transport.rb new/openwsman-2.2.7/bindings/ruby/tests/transport.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/transport.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/transport.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# transport.rb
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/win32_operatingsystem.rb new/openwsman-2.2.7/bindings/ruby/tests/win32_operatingsystem.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/win32_operatingsystem.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/win32_operatingsystem.rb 2011-09-21 10:25:09.000000000 +0200
@@ -5,13 +5,10 @@
#
#
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/win32_process.rb new/openwsman-2.2.7/bindings/ruby/tests/win32_process.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/win32_process.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/win32_process.rb 2011-09-21 10:25:09.000000000 +0200
@@ -5,13 +5,10 @@
#
#
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
class WsmanTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/win32_registry.rb new/openwsman-2.2.7/bindings/ruby/tests/win32_registry.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/win32_registry.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/win32_registry.rb 2011-09-21 10:25:09.000000000 +0200
@@ -11,11 +11,9 @@
# http://msdn.microsoft.com/en-us/library/aa390387(v=vs.85).aspx
#
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
+require '_loadpath'
require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/win32_services.rb new/openwsman-2.2.7/bindings/ruby/tests/win32_services.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/win32_services.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/win32_services.rb 2011-09-21 10:25:09.000000000 +0200
@@ -5,13 +5,10 @@
#
#
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
require 'auth-callback'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/winenum.rb new/openwsman-2.2.7/bindings/ruby/tests/winenum.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/winenum.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/winenum.rb 2011-09-21 10:25:09.000000000 +0200
@@ -3,12 +3,9 @@
#
#
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/winrm-subscribe.rb new/openwsman-2.2.7/bindings/ruby/tests/winrm-subscribe.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/winrm-subscribe.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/winrm-subscribe.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,13 +1,10 @@
# subscribe.rb
# generate listing 9 of http://www.ibm.com/developerworks/webservices/library/ws-CIM/index.html
-$:.unshift "../../../bindings/ruby"
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
require 'rexml/document'
-require 'openwsman/openwsman'
+require '_loadpath'
+require 'openwsman'
require 'auth-callback'
require '_client'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/xmlattr.rb new/openwsman-2.2.7/bindings/ruby/tests/xmlattr.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/xmlattr.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/xmlattr.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# test XmlAttr class
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class XmlAttrTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/xmldoc.rb new/openwsman-2.2.7/bindings/ruby/tests/xmldoc.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/xmldoc.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/xmldoc.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# test XmlDoc class
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class XmlDocTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/bindings/ruby/tests/xmlnode.rb new/openwsman-2.2.7/bindings/ruby/tests/xmlnode.rb
--- old/openwsman-2.2.7/bindings/ruby/tests/xmlnode.rb 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/bindings/ruby/tests/xmlnode.rb 2011-09-21 10:25:09.000000000 +0200
@@ -1,9 +1,7 @@
# test XmlNode class
-$:.unshift "../../../build/bindings/ruby"
-$:.unshift "../.libs"
-
require 'test/unit'
+require '_loadpath'
require 'openwsman'
class XmlNodeTest < Test::Unit::TestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/etc/init/openwsmand.sh.cmake new/openwsman-2.2.7/etc/init/openwsmand.sh.cmake
--- old/openwsman-2.2.7/etc/init/openwsmand.sh.cmake 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/etc/init/openwsmand.sh.cmake 2011-09-21 10:25:09.000000000 +0200
@@ -4,7 +4,7 @@
# Provides: openwsmand
# Required-Start: $remote_fs
# Required-Stop: $network
-# Default-Start: 2 3 4 5
+# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Short-Description: Openwsman Daemon
# Description: openwsmand
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/package/openwsman-initscript.patch new/openwsman-2.2.7/package/openwsman-initscript.patch
--- old/openwsman-2.2.7/package/openwsman-initscript.patch 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/package/openwsman-initscript.patch 2011-09-21 10:25:09.000000000 +0200
@@ -5,7 +5,7 @@
# Provides: openwsmand
# Required-Start: $remote_fs
# Required-Stop: $network
--# Default-Start: 2 3 4 5
+-# Default-Start: 2 3 5
-# Default-Stop: 0 1 6
+# Default-Start:
+# Default-Stop:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/package/openwsman-pam-auth.patch new/openwsman-2.2.7/package/openwsman-pam-auth.patch
--- old/openwsman-2.2.7/package/openwsman-pam-auth.patch 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/package/openwsman-pam-auth.patch 2011-09-21 10:25:09.000000000 +0200
@@ -10,7 +10,7 @@
+#basic_password_file = /etc/openwsman/simple_auth.passwd
min_threads = 4
- max_threads = 10
+ max_threads = 0
@@ -15,8 +15,8 @@
# Authentication backend for BASIC authentication. Default is to read a configuration file defined with 'basic_password_file'
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/package/openwsman.spec.in new/openwsman-2.2.7/package/openwsman.spec.in
--- old/openwsman-2.2.7/package/openwsman.spec.in 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/package/openwsman.spec.in 2011-09-21 10:25:09.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package openwsman (Version @VERSION@)
+# spec file for package openwsman
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
BuildRequires: libxml2-devel pam-devel sblim-sfcc-devel
BuildRequires: cmake
-BuildRequires: perl python-devel java-devel
+BuildRequires: java-devel perl python-devel
%if 0%{?rhel_version} > 0
BuildRequires: -vim
@@ -37,7 +37,6 @@
%endif
%if 0%{?suse_version} > 0
-
# No jni_md.h on SLE10 :-/
#%if 0%{?suse_version} < 1100
#BuildRequires: java-1_5_0-ibm-devel
@@ -46,12 +45,12 @@
#%endif
%if 0%{?suse_version} > 1010
-BuildRequires: fdupes libopenssl-devel
-BuildRequires: libcurl-devel
+BuildRequires: fdupes libopenssl-devel
+BuildRequires: libcurl-devel
%else
# SLE10
-BuildRequires: libidn-devel openssl-devel
-BuildRequires: curl-devel
+BuildRequires: libidn-devel openssl-devel
+BuildRequires: curl-devel
%endif
%if 0%{?suse_version} > 910
@@ -64,7 +63,7 @@
%endif
-Requires(Pre): sed coreutils grep /bin/hostname
+Requires(pre): sed coreutils grep /bin/hostname
Version: @VERSION@
Release: 1
# Mandriva:
@@ -86,15 +85,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Opensource Implementation of WS-Management
-
-
+Opensource Implementation of WS-Management protocol stack
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
%package -n libwsman1
License: BSD3c(or similar)
@@ -104,15 +96,8 @@
Obsoletes: openwsman < %{version}
%description -n libwsman1
-Opensource Implementation of WS-Management
-
-
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
+Opensource Implementation of WS-Management protocol stack
+(Common libraries)
%package -n libwsman-devel
License: BSD3c(or similar)
@@ -125,39 +110,37 @@
Requires: sblim-sfcc-devel libxml2-devel pam-devel
%description -n libwsman-devel
-Opensource Implementation of WS-Management
-
-
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
+Opensource Implementation of WS-Management stack
+(Development files)
-%package client-c++
+%package -n libwsman_clientpp1
License: BSD3c(or similar)
Group: System/Management
Summary: C++ bindings to Openwsman Client libraries
-Provides: openwsman-client
+Provides: openwsman-client = %{version}
Obsoletes: openwsman-client < %{version}
-%description client-c++
+
+%description -n libwsman_clientpp1
An implementation of the WsmanClient interface using C++
+%package -n libwsman_clientpp-devel
+License: BSD3c(or similar)
+Group: System/Management
+Summary: C++ bindings to Openwsman Client libraries
+Requires: libwsman_clientpp1 = %{version}
+Requires: libwsman-devel = %{version}
+
+%description -n libwsman_clientpp-devel
+Development files for C++ interface to OpenWSMAN client library.
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
%package server
License: BSD3c(or similar)
Group: System/Management
-Requires(Pre): sed coreutils grep diffutils /bin/hostname
+Requires(pre): sed coreutils grep diffutils /bin/hostname
%if 0%{?suse_version}
-Requires(Pre): fillup
+Requires(pre): fillup
%endif
Summary: Openwsman Server and service libraries
@@ -165,14 +148,6 @@
Openwsman Server and service libraries
-
-Authors:
---------
- Anas Nashif
- Vadim Revyakin
- Denis Sadykov
-
-
%package python
License: BSD3c(or similar)
Group: Development/Libraries/Python
@@ -187,11 +162,6 @@
API.
-
-Authors:
---------
- Klaus Kaempf
-
%package ruby
License: BSD3c(or similar)
Group: System/Management
@@ -212,11 +182,6 @@
This package provides Ruby bindings to access the openwsman client API.
-
-Authors:
---------
- Klaus Kaempf
-
%package perl
License: BSD3c(or similar)
Group: System/Management
@@ -231,27 +196,18 @@
This package provides Perl bindings to access the openwsman client API.
-
-Authors:
---------
- Klaus Kaempf
-
%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1100
%package java
License: BSD3c(or similar)
Group: System/Management
Requires: java
-Requires: libwsman1
+Requires: libwsman1 = %{version}
Summary: Java bindings for openwsman client API
%description java
This package provides Java bindings to access the openwsman client API.
-
-Authors:
---------
- Klaus Kaempf
%endif
%prep
@@ -304,9 +260,6 @@
install -D -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openwsman
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -n libwsman1 -p /sbin/ldconfig
%postun -n libwsman1 -p /sbin/ldconfig
@@ -328,6 +281,7 @@
%postun server
%if 0%{?suse_version}
+%{restart_on_update openwsmand}
%{insserv_cleanup openwsmand}
%else
# FIXME: chkconfig?!
@@ -335,9 +289,9 @@
rm -f /var/log/wsmand.log
/sbin/ldconfig
-%post client-c++ -p /sbin/ldconfig
+%post -n libwsman_clientpp1 -p /sbin/ldconfig
-%postun client-c++ -p /sbin/ldconfig
+%postun -n libwsman_clientpp1 -p /sbin/ldconfig
%files -n libwsman1
%defattr(-,root,root)
@@ -360,19 +314,15 @@
%files ruby
%defattr(-,root,root)
-%if 0%{?suse_version}
-%{ruby_sitearch}/openwsman.so
-%dir %{ruby_sitelib}/openwsman
-%{ruby_sitelib}/openwsman/*.rb
-%endif
%if 0%{?mandriva_version}
-%{ruby_sitearchdir}/openwsman.so
+%{ruby_sitearchdir}/_openwsman.so
%dir %{ruby_sitelibdir}/openwsman
+%{ruby_sitelibdir}/openwsman.rb
%{ruby_sitelibdir}/openwsman/*.rb
-%endif
-%if 0%{?fedora} > 0 || 0%{?rhel_version} > 0
-%{ruby_sitearch}/openwsman.so
+%else
+%{ruby_sitearch}/_openwsman.so
%dir %{ruby_sitelib}/openwsman
+%{ruby_sitelib}/openwsman.rb
%{ruby_sitelib}/openwsman/*.rb
%endif
@@ -409,8 +359,14 @@
%{_sbindir}/rcopenwsmand
%{_libdir}/libwsman_server.so.*
-%files client-c++
+%files -n libwsman_clientpp1
%defattr(-,root,root)
%{_libdir}/libwsman_clientpp.so.*
+%files -n libwsman_clientpp-devel
+%defattr(-,root,root)
+%{_libdir}/libwsman_clientpp.so
+%dir %{_includedir}/openwsman/cpp
+%{_includedir}/openwsman/cpp/*.h
+
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/src/lib/wsman-client-transport.c new/openwsman-2.2.7/src/lib/wsman-client-transport.c
--- old/openwsman-2.2.7/src/lib/wsman-client-transport.c 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/src/lib/wsman-client-transport.c 2011-09-21 10:25:09.000000000 +0200
@@ -51,12 +51,12 @@
#include "wsman-client.h"
static char *auth_methods[] = {
- "noauth",
- "basic",
- "digest",
- "pass",
- "ntlm",
- "gss",
+ _WS_NO_AUTH,
+ _WS_BASIC_AUTH,
+ _WS_DIGEST_AUTH,
+ _WS_PASS_AUTH,
+ _WS_NTLM_AUTH,
+ _WS_GSSNEGOTIATE_AUTH,
NULL,
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.2.7/src/lib/wsman-curl-client-transport.c new/openwsman-2.2.7/src/lib/wsman-curl-client-transport.c
--- old/openwsman-2.2.7/src/lib/wsman-curl-client-transport.c 2011-09-09 14:40:39.000000000 +0200
+++ new/openwsman-2.2.7/src/lib/wsman-curl-client-transport.c 2011-09-21 10:25:09.000000000 +0200
@@ -105,8 +105,8 @@
goto REQUEST_PASSWORD;
}
- debug("Client does not support authentication type "
- " acceptable by server\n");
+ debug("Client does not support authentication type 0x%04x"
+ " acceptable by server\n", auth_avail);
return 0;
++++++ openwsman-initscript.patch ++++++
--- /var/tmp/diff_new_pack.lVSXk1/_old 2012-02-02 17:58:58.000000000 +0100
+++ /var/tmp/diff_new_pack.lVSXk1/_new 2012-02-02 17:58:58.000000000 +0100
@@ -5,7 +5,7 @@
# Provides: openwsmand
# Required-Start: $remote_fs
# Required-Stop: $network
--# Default-Start: 2 3 4 5
+-# Default-Start: 2 3 5
-# Default-Stop: 0 1 6
+# Default-Start:
+# Default-Stop:
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org