extras-wsdlpull-svn Mailing List for Extras WSDLPull
Status: Beta
Brought to you by:
denis_arnaud
Menu
▾
▴
extras-wsdlpull-svn — Subversion Activity Notification List
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(13) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <den...@us...> - 2010-07-18 20:10:33
|
Revision: 201
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=201&view=rev
Author: denis_arnaud
Date: 2010-07-18 19:45:47 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
[Release] Release 1.24.
Modified Paths:
--------------
trunk/wsdlpull/AUTHORS
trunk/wsdlpull/ChangeLog
trunk/wsdlpull/NEWS
Modified: trunk/wsdlpull/AUTHORS
===================================================================
--- trunk/wsdlpull/AUTHORS 2010-07-18 19:33:34 UTC (rev 200)
+++ trunk/wsdlpull/AUTHORS 2010-07-18 19:45:47 UTC (rev 201)
@@ -1,11 +1,13 @@
Authors
1. Vivek Krishna <viv...@us...>
-Other contributors
-Daniel Rodriguez (for the xpath implementation)
-Meindert Oldenburger (for making wsdlpull more thread safe)
-Scott Chun (Windows DLL export)
-Philip Helger (Windows makefile)
-Thomas Steinel
-Stefan Fleiter
-Igor Polyakov
+2. Other contributors
+- Daniel Rodriguez (for the xpath implementation)
+- Meindert Oldenburger (for making wsdlpull more thread safe)
+- Scott Chun (Windows DLL export)
+- Philip Helger (Windows makefile)
+- Thomas Steinel
+- Stefan Fleiter
+- Igor Polyakov
+- Denis Arnaud (Fedora/RedHat packaging, g++ 4.x error and warning fixes)
+
Modified: trunk/wsdlpull/ChangeLog
===================================================================
--- trunk/wsdlpull/ChangeLog 2010-07-18 19:33:34 UTC (rev 200)
+++ trunk/wsdlpull/ChangeLog 2010-07-18 19:45:47 UTC (rev 201)
@@ -0,0 +1,10 @@
+
+* Sun Jul 18 2010 - Denis Arnaud <den...@m4...> - 1.24
+- Release 1.24
+- A few bugs have been fixed
+- Better Autotools build
+- The SCM (Source Code Management) will move to Subversion
+
+* Thu Jan 18 2010 - Vivek Krishna <viv...@us...> - 1.23
+- Release 1.23
+
Modified: trunk/wsdlpull/NEWS
===================================================================
--- trunk/wsdlpull/NEWS 2010-07-18 19:33:34 UTC (rev 200)
+++ trunk/wsdlpull/NEWS 2010-07-18 19:45:47 UTC (rev 201)
@@ -0,0 +1,6 @@
+
+* Sun Jul 18 2010 - Release 1.24
+- A few bugs have been fixed
+- Better Autotools build
+- The SCM (Source Code Management) will move to Subversion
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-18 20:09:48
|
Revision: 200
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=200&view=rev
Author: denis_arnaud
Date: 2010-07-18 19:33:34 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
[Dev] Fixed a compilation warning.
Modified Paths:
--------------
trunk/wsdlpull/examples/schema/complexTypes.xsd
trunk/wsdlpull/examples/schema/first-building-blocks.xsd
trunk/wsdlpull/examples/schema/first-complex-types.xsd
trunk/wsdlpull/examples/schema/first.xml
trunk/wsdlpull/examples/schema/simpleTypes.xsd
trunk/wsdlpull/src/schemaparser/SchemaParser.cpp
trunk/wsdlpull/wsdlpull.spec
Modified: trunk/wsdlpull/examples/schema/complexTypes.xsd
===================================================================
--- trunk/wsdlpull/examples/schema/complexTypes.xsd 2010-07-18 17:23:15 UTC (rev 199)
+++ trunk/wsdlpull/examples/schema/complexTypes.xsd 2010-07-18 19:33:34 UTC (rev 200)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/examples/schema/complexTypes.xsd,v 1.1 2005-05-03 17:01:47 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -35,3 +34,4 @@
</xs:schema>
+
Modified: trunk/wsdlpull/examples/schema/first-building-blocks.xsd
===================================================================
--- trunk/wsdlpull/examples/schema/first-building-blocks.xsd 2010-07-18 17:23:15 UTC (rev 199)
+++ trunk/wsdlpull/examples/schema/first-building-blocks.xsd 2010-07-18 19:33:34 UTC (rev 200)
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/examples/schema/first-building-blocks.xsd,v 1.1 2005-05-03 17:01:47 vivek200120 Exp $ -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:include schemaLocation="simpleTypes.xsd"/>
- <xs:include schemaLocation="complexTypes.xsd"/>
-
- <xs:element name="name" type="string32"/>
- <xs:element name="qualification" type="string255"/>
- <xs:element name="born" type="date"/>
- <xs:element name="dead" type="date"/>
- <xs:element name="isbn" type="isbn"/>
-
- <xs:attribute name="id" type="xs:ID"/>
- <xs:attribute name="available" type="xs:boolean"/>
- <xs:attribute name="lang" type="supportedLanguages"/>
-
-
- <xs:element name="title">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="string255">
- <xs:attribute ref="lang"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="library">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="book" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="book">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="bookTmp">
- <xs:sequence>
- <xs:element ref="isbn"/>
- <xs:element ref="title"/>
- <xs:element ref="author" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="character" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="id" type="bookID"/>
- <xs:attribute ref="available"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="author">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="personType">
- <xs:sequence>
- <xs:element ref="name"/>
- <xs:element ref="born"/>
- <xs:element ref="dead" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute ref="id"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
-
- <xs:element name="character">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="personType">
- <xs:sequence>
- <xs:element ref="name"/>
- <xs:element ref="born"/>
- <xs:element ref="qualification"/>
- </xs:sequence>
- <xs:attribute ref="id"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="simpleTypes.xsd"/>
+ <xs:include schemaLocation="complexTypes.xsd"/>
+
+ <xs:element name="name" type="string32"/>
+ <xs:element name="qualification" type="string255"/>
+ <xs:element name="born" type="date"/>
+ <xs:element name="dead" type="date"/>
+ <xs:element name="isbn" type="isbn"/>
+
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="available" type="xs:boolean"/>
+ <xs:attribute name="lang" type="supportedLanguages"/>
+
+
+ <xs:element name="title">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="string255">
+ <xs:attribute ref="lang"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="library">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="book" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="book">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:restriction base="bookTmp">
+ <xs:sequence>
+ <xs:element ref="isbn"/>
+ <xs:element ref="title"/>
+ <xs:element ref="author" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="character" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="bookID"/>
+ <xs:attribute ref="available"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="author">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:restriction base="personType">
+ <xs:sequence>
+ <xs:element ref="name"/>
+ <xs:element ref="born"/>
+ <xs:element ref="dead" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute ref="id"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+
+ <xs:element name="character">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:restriction base="personType">
+ <xs:sequence>
+ <xs:element ref="name"/>
+ <xs:element ref="born"/>
+ <xs:element ref="qualification"/>
+ </xs:sequence>
+ <xs:attribute ref="id"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
+
Modified: trunk/wsdlpull/examples/schema/first-complex-types.xsd
===================================================================
--- trunk/wsdlpull/examples/schema/first-complex-types.xsd 2010-07-18 17:23:15 UTC (rev 199)
+++ trunk/wsdlpull/examples/schema/first-complex-types.xsd 2010-07-18 19:33:34 UTC (rev 200)
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/examples/schema/first-complex-types.xsd,v 1.1 2005-05-03 17:01:47 vivek200120 Exp $ -->
-<!-- Copyright O'Reilly -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="string255">
@@ -143,3 +141,4 @@
</xs:element>
</xs:schema>
+
Modified: trunk/wsdlpull/examples/schema/first.xml
===================================================================
--- trunk/wsdlpull/examples/schema/first.xml 2010-07-18 17:23:15 UTC (rev 199)
+++ trunk/wsdlpull/examples/schema/first.xml 2010-07-18 19:33:34 UTC (rev 200)
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/examples/schema/first.xml,v 1.1 2005-05-03 17:01:47 vivek200120 Exp $ -->
-<!-- Copyright O'Reilly -->
<library>
<book id="b0836217462" available="true">
<isbn>0836217462</isbn>
@@ -32,3 +30,4 @@
</character>
</book>
</library>
+
Modified: trunk/wsdlpull/examples/schema/simpleTypes.xsd
===================================================================
--- trunk/wsdlpull/examples/schema/simpleTypes.xsd 2010-07-18 17:23:15 UTC (rev 199)
+++ trunk/wsdlpull/examples/schema/simpleTypes.xsd 2010-07-18 19:33:34 UTC (rev 200)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/examples/schema/simpleTypes.xsd,v 1.2 2005-08-07 04:46:20 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="string255">
@@ -36,3 +35,4 @@
</xs:simpleType>
</xs:schema>
+
Modified: trunk/wsdlpull/src/schemaparser/SchemaParser.cpp
===================================================================
--- trunk/wsdlpull/src/schemaparser/SchemaParser.cpp 2010-07-18 17:23:15 UTC (rev 199)
+++ trunk/wsdlpull/src/schemaparser/SchemaParser.cpp 2010-07-18 19:33:34 UTC (rev 200)
@@ -835,8 +835,8 @@
std::string elemName=xParser_->getName();
if (xParser_->getEventType() == xParser_->END_TAG) {
if ((cstr==Schema::Key && elemName == "key")
- || (cstr==Schema::Keyref && elemName == "keyref")
- || (cstr==Schema::Unique && elemName == "unique")) {
+ || (cstr==Schema::Keyref && elemName == "keyref")
+ || (cstr==Schema::Unique && elemName == "unique")) {
break;
}
Modified: trunk/wsdlpull/wsdlpull.spec
===================================================================
--- trunk/wsdlpull/wsdlpull.spec 2010-07-18 17:23:15 UTC (rev 199)
+++ trunk/wsdlpull/wsdlpull.spec 2010-07-18 19:33:34 UTC (rev 200)
@@ -7,8 +7,8 @@
%global mydocs __tmp_docdir
#
Name: wsdlpull
-Version: 1.23
-Release: 3%{?dist}
+Version: 1.24
+Release: 1%{?dist}
Summary: C++ Web Services client library
@@ -18,12 +18,6 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
-# That patch will be submitted upstream
-Patch0: wsdlpull-%{version}-fix-gcc43-compatibility.patch
-# That patch will be submitted upstream
-Patch1: wsdlpull-%{version}-add-man-pages.patch
-# That patch will be submitted upstream
-Patch2: wsdlpull-%{version}-fix-gnu-autotools-compatibility.patch
%description
%{name} is a C++ web services client library. It includes a WSDL
@@ -60,43 +54,6 @@
%prep
%setup -q
-# Apply the g++ 4.3 compatibility patch
-%patch0 -p1
-
-# Create a directory for man pages
-%{__mkdir} man
-
-# Apply the man page patch
-%patch1 -p1
-
-# Remove any CVS sub-directory (they should not be delivered with the tar-ball)
-find . -name 'CVS' -print | xargs -r %{__rm} -rf
-
-# Remove any a.out binary (they should not be delivered with the tar-ball)
-find . -name 'a.out' -print | xargs -r %{__rm} -f
-
-# Remove the generated HTML documentation (it should not be delivered
-# with the tar-ball, as it is generated)
-if [ -d docs/html ]; then
- %{__rm} -rf docs/html
-fi
-
-# Adapt a little bit the structure, so as to be more compliant with
-# GNU Autotools
-%{__mkdir} config
-%{__mv} config.guess config.sub depcomp install-sh ltmain.sh missing config
-%{__mv} config.h.in src
-
-# Rename the standard documentation files
-%{__mv} AUTHORS.txt AUTHORS
-sed -i -e 's/\r$//' AUTHORS
-%{__mv} CHANGES.txt CHANGES
-%{__mv} COPYING.txt COPYING
-%{__mv} README.txt README
-
-# Apply the GNU Autotools compatibility patch
-%patch2 -p1
-
%build
%configure --disable-static
make %{?_smp_mflags}
@@ -131,9 +88,7 @@
%files devel
%defattr(-,root,root,-)
-%{_includedir}/schemaparser
-%{_includedir}/wsdlparser
-%{_includedir}/xmlpull
+%{_includedir}/%{name}
%{_libdir}/lib*.so
%files doc
@@ -143,6 +98,9 @@
%changelog
+* Sun Jul 18 2010 Denis Arnaud <den...@m4...> 1.24-1
+- Upstream integration
+
* Tue Jul 14 2010 Denis Arnaud <den...@m4...> 1.23-3
- Integrated Patrick Monnerat's remarks
(https://bugzilla.redhat.com/show_bug.cgi?id=502686#c13)
@@ -153,3 +111,4 @@
* Tue Jun 26 2009 Denis Arnaud <den...@m4...> 1.23-1
- Initial package, thanks to Dries Verachtert <dr...@ul...>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-18 19:47:50
|
Revision: 202
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=202&view=rev
Author: denis_arnaud
Date: 2010-07-18 19:47:43 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
[Release] New working version.
Modified Paths:
--------------
trunk/wsdlpull/configure.in
Modified: trunk/wsdlpull/configure.in
===================================================================
--- trunk/wsdlpull/configure.in 2010-07-18 19:45:47 UTC (rev 201)
+++ trunk/wsdlpull/configure.in 2010-07-18 19:47:43 UTC (rev 202)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Vivek Krishna <viv...@us...>])
-AC_INIT([WSDLPull],[1.24],[viv...@us...],[wsdlpull])
+AC_INIT([WSDLPull],[99.99.99],[viv...@us...],[wsdlpull])
AC_CONFIG_HEADER([src/config.h])
AC_CONFIG_SRCDIR([src/wsdlparser/WsdlParser.cpp])
AC_CONFIG_AUX_DIR([config])
@@ -13,7 +13,7 @@
# Configure file for wsdlpull
# Shared library versioning
-GENERIC_LIBRARY_VERSION="1:24:0"
+GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
# +------+ | +---+
# | | |
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-18 17:23:22
|
Revision: 199
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=199&view=rev
Author: denis_arnaud
Date: 2010-07-18 17:23:15 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
[Dev] Converted DOS files into Unix files.
Modified Paths:
--------------
trunk/wsdlpull/Makefile.am
trunk/wsdlpull/examples/Makefile.am
trunk/wsdlpull/examples/print/Makefile.am
trunk/wsdlpull/examples/stocks/Makefile.am
trunk/wsdlpull/examples/xml/Makefile.am
trunk/wsdlpull/src/Makefile.am
trunk/wsdlpull/src/schemaparser/Makefile.am
trunk/wsdlpull/src/schemas/http.xsd
trunk/wsdlpull/src/schemas/mime.xsd
trunk/wsdlpull/src/schemas/schema.dtd
trunk/wsdlpull/src/schemas/soap-encoding.xsd
trunk/wsdlpull/src/schemas/soap.xsd
trunk/wsdlpull/src/schemas/soap12.xsd
trunk/wsdlpull/src/schemas/wsdl10.xsd
trunk/wsdlpull/src/tools/Makefile.am
trunk/wsdlpull/src/utils/utility.cpp
trunk/wsdlpull/src/utils/utils.h
trunk/wsdlpull/src/wsdlparser/Makefile.am
trunk/wsdlpull/src/wsdlparser/Wsdl.h
trunk/wsdlpull/src/wsdlparser/wsdl.h
trunk/wsdlpull/src/xmlpull/ConfigFile.cpp
trunk/wsdlpull/src/xmlpull/ConfigFile.h
trunk/wsdlpull/tests/schema/po.xsd
trunk/wsdlpull/win32/_depend
trunk/wsdlpull/win32/curl/CHANGES
trunk/wsdlpull/win32/curl/COPYING
trunk/wsdlpull/win32/curl/README
trunk/wsdlpull/win32/curl/RELEASE-NOTES
trunk/wsdlpull/win32/makefile.vc2003
trunk/wsdlpull/win32/print.dsp
trunk/wsdlpull/win32/schema.dsp
trunk/wsdlpull/win32/stocks.dsp
trunk/wsdlpull/win32/vs2005/wsdlpull.sln
trunk/wsdlpull/win32/vs2008/wsdlpull.sln
trunk/wsdlpull/win32/wsdl.dsp
trunk/wsdlpull/win32/wsdlpull.dsp
trunk/wsdlpull/win32/wsdlpull.dsw
trunk/wsdlpull/win32/xml.dsp
trunk/wsdlpull/wsdlpull.html
Added Paths:
-----------
trunk/wsdlpull/ChangeLog
trunk/wsdlpull/Makefile.common
trunk/wsdlpull/NEWS
Property Changed:
----------------
trunk/wsdlpull/
trunk/wsdlpull/config/
Property changes on: trunk/wsdlpull
___________________________________________________________________
Modified: svn:ignore
- config.log
config.status
configure
libtool
aclocal.m4
autom4te.cache
Makefile
Makefile.in
wsdlpull-*.tar.*
+ config.log
config.status
configure
libtool
aclocal.m4
autom4te.cache
INSTALL
Makefile
Makefile.in
wsdlpull-*.tar.*
Added: trunk/wsdlpull/ChangeLog
===================================================================
Modified: trunk/wsdlpull/Makefile.am
===================================================================
--- trunk/wsdlpull/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/Makefile.am 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,4 +1,8 @@
-## wsdlpull
+## wsdlpull top directory
+include $(top_srcdir)/Makefile.common
+
+ACLOCAL_AMFLAGS = -I config
+
AUTOMAKE_OPTIONS = dist-bzip2
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
Added: trunk/wsdlpull/Makefile.common
===================================================================
--- trunk/wsdlpull/Makefile.common (rev 0)
+++ trunk/wsdlpull/Makefile.common 2010-07-18 17:23:15 UTC (rev 199)
@@ -0,0 +1,2 @@
+@SET_MAKE@
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
Added: trunk/wsdlpull/NEWS
===================================================================
Property changes on: trunk/wsdlpull/config
___________________________________________________________________
Modified: svn:ignore
- depcomp
missing
config.guess
config.sub
ltmain.sh
install-sh
+ depcomp
missing
config.guess
config.sub
ltmain.sh
install-sh
ltsugar.m4
libtool.m4
ltversion.m4
lt~obsolete.m4
ltoptions.m4
Modified: trunk/wsdlpull/examples/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/examples/Makefile.am 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,7 +1,7 @@
-## examples
-## This is the input file for automake, which will generate Makefile.in ##
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = print xml stocks
-
+## examples
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = print xml stocks
+
Modified: trunk/wsdlpull/examples/print/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/print/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/examples/print/Makefile.am 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,21 +1,21 @@
-## examples/print
-## This is the input file for automake, which will generate Makefile.in ##
-
-MAINTAINERCLEANFILES = Makefile.in
-
-#
-bin_PROGRAMS = print
-
-print_SOURCES = print.cpp
-print_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
-print_LDFLAGS = \
- $(top_builddir)/src/wsdlparser/libwsdlpull.la \
- $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
- $(top_builddir)/src/xmlpull/libwsdlpullxml.la
-
-#
-docsdir = $(prefix)/docs
-docs_DATA = README_print.txt
-
-EXTRA_DIST = $(docs_DATA)
-
+## examples/print
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+#
+bin_PROGRAMS = print
+
+print_SOURCES = print.cpp
+print_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
+print_LDFLAGS = \
+ $(top_builddir)/src/wsdlparser/libwsdlpull.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la
+
+#
+docsdir = $(prefix)/docs
+docs_DATA = README_print.txt
+
+EXTRA_DIST = $(docs_DATA)
+
Modified: trunk/wsdlpull/examples/stocks/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/stocks/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/examples/stocks/Makefile.am 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,15 +1,15 @@
-## examples/stocks
-## This is the input file for automake, which will generate Makefile.in ##
-
-MAINTAINERCLEANFILES = Makefile.in
-
-#
-bin_PROGRAMS = stocks
-
-stocks_SOURCES = stocks.cpp
-stocks_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
-stocks_LDFLAGS = \
- $(top_builddir)/src/wsdlparser/libwsdlpull.la \
- $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
- $(top_builddir)/src/xmlpull/libwsdlpullxml.la
-
+## examples/stocks
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+#
+bin_PROGRAMS = stocks
+
+stocks_SOURCES = stocks.cpp
+stocks_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
+stocks_LDFLAGS = \
+ $(top_builddir)/src/wsdlparser/libwsdlpull.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la
+
Modified: trunk/wsdlpull/examples/xml/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/xml/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/examples/xml/Makefile.am 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,11 +1,11 @@
-## examples/xml
-## This is the input file for automake, which will generate Makefile.in ##
-
-MAINTAINERCLEANFILES = Makefile.in
-
-#
-bin_PROGRAMS = roundtrip
-
-roundtrip_SOURCES = roundtrip.cpp
-roundtrip_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la
-
+## examples/xml
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+#
+bin_PROGRAMS = roundtrip
+
+roundtrip_SOURCES = roundtrip.cpp
+roundtrip_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la
+
Modified: trunk/wsdlpull/src/Makefile.am
===================================================================
--- trunk/wsdlpull/src/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/src/Makefile.am 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,7 +1,7 @@
-# wsdlpull/src
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = xmlpull schemaparser wsdlparser schemas tools
-
+# wsdlpull/src
+#
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = xmlpull schemaparser wsdlparser schemas tools
+
Modified: trunk/wsdlpull/src/schemaparser/Makefile.am
===================================================================
--- trunk/wsdlpull/src/schemaparser/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/src/schemaparser/Makefile.am 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,19 +1,19 @@
-## This is the input file for automake, which will generate Makefile.in ##
-
-MAINTAINERCLEANFILES = Makefile.in
-
-# src/schemaparser
-include $(srcdir)/sources.mk
-
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
-CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
-
-lib_LTLIBRARIES = libwsdlpullschema.la
-
-libwsdlpullschema_la_SOURCES = $(schema_h_sources) $(schema_cc_sources)
-libwsdlpullschema_la_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
- -version-info $(GENERIC_LIBRARY_VERSION)
-
-pkginclude_HEADERS = $(schema_h_sources)
-pkgincludedir= $(includedir)/wsdlpull/schemaparser
-
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+# src/schemaparser
+include $(srcdir)/sources.mk
+
+#
+lib_LTLIBRARIES = libwsdlpullschema.la
+
+libwsdlpullschema_la_SOURCES = $(schema_h_sources) $(schema_cc_sources)
+libwsdlpullschema_la_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
+libwsdlpullschema_la_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ -version-info $(GENERIC_LIBRARY_VERSION)
+
+#
+pkginclude_HEADERS = $(schema_h_sources)
+pkgincludedir= $(includedir)/wsdlpull/schemaparser
+
Modified: trunk/wsdlpull/src/schemas/http.xsd
===================================================================
--- trunk/wsdlpull/src/schemas/http.xsd 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/src/schemas/http.xsd 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,25 +1,25 @@
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- targetNamespace="http://schemas.xmlsoap.org/wsdl/http/">
-<element name="address" type="http:addressType"/>
-<complexType name="addressType">
-<attribute name="location" type="uriReference" use="required"/>
-</complexType>
-<element name="binding" type="http:bindingType"/>
-<complexType name="bindingType">
-<attribute name="verb" type="NMTOKEN" use="required"/>
-</complexType>
-<element name="operation" type="http:operationType"/>
-<complexType name="operationType">
-<attribute name="location" type="uriReference" use="required"/>
-</complexType>
-<element name="urlEncoded">
-<complexType>
-</complexType>
-</element>
-<element name="urlReplacement">
-<complexType>
-</complexType>
-</element>
-</schema>
-
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ targetNamespace="http://schemas.xmlsoap.org/wsdl/http/">
+<element name="address" type="http:addressType"/>
+<complexType name="addressType">
+<attribute name="location" type="uriReference" use="required"/>
+</complexType>
+<element name="binding" type="http:bindingType"/>
+<complexType name="bindingType">
+<attribute name="verb" type="NMTOKEN" use="required"/>
+</complexType>
+<element name="operation" type="http:operationType"/>
+<complexType name="operationType">
+<attribute name="location" type="uriReference" use="required"/>
+</complexType>
+<element name="urlEncoded">
+<complexType>
+</complexType>
+</element>
+<element name="urlReplacement">
+<complexType>
+</complexType>
+</element>
+</schema>
+
Modified: trunk/wsdlpull/src/schemas/mime.xsd
===================================================================
--- trunk/wsdlpull/src/schemas/mime.xsd 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/src/schemas/mime.xsd 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,27 +1,27 @@
-<schema targetNamespace="http://schemas.xmlsoap.org/wsdl/mime/"
- xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
- xmlns="http://www.w3.org/2001/XMLSchema">
-<element name="content" type="mime:contentType"/>
-<complexType name="contentType" content="empty">
-<attribute name="type" type="string" use="optional"/>
-<attribute name="part" type="NMTOKEN" use="optional"/>
-</complexType>
-<element name="multipartRelated" type="mime:multipartRelatedType"/>
-<complexType name="multipartRelatedType" content="elementOnly">
-<sequence>
-<element ref="mime:part" minOccurs="0" maxOccurs="unbounded"/>
-</sequence>
-</complexType>
-<element name="part" type="mime:partType"/>
-<complexType name="partType" content="elementOnly">
-<sequence>
-<any namespace="targetNamespace" minOccurs="0" maxOccurs="unbounded"/>
-</sequence>
-<attribute name="name" type="NMTOKEN" use="required"/>
-</complexType>
-<element name="mimeXml" type="mime:mimeXmlType"/>
-<complexType name="mimeXmlType" content="empty">
-<attribute name="part" type="NMTOKEN" use="optional"/>
-</complexType>
-</schema>
-
+<schema targetNamespace="http://schemas.xmlsoap.org/wsdl/mime/"
+ xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+ xmlns="http://www.w3.org/2001/XMLSchema">
+<element name="content" type="mime:contentType"/>
+<complexType name="contentType" content="empty">
+<attribute name="type" type="string" use="optional"/>
+<attribute name="part" type="NMTOKEN" use="optional"/>
+</complexType>
+<element name="multipartRelated" type="mime:multipartRelatedType"/>
+<complexType name="multipartRelatedType" content="elementOnly">
+<sequence>
+<element ref="mime:part" minOccurs="0" maxOccurs="unbounded"/>
+</sequence>
+</complexType>
+<element name="part" type="mime:partType"/>
+<complexType name="partType" content="elementOnly">
+<sequence>
+<any namespace="targetNamespace" minOccurs="0" maxOccurs="unbounded"/>
+</sequence>
+<attribute name="name" type="NMTOKEN" use="required"/>
+</complexType>
+<element name="mimeXml" type="mime:mimeXmlType"/>
+<complexType name="mimeXmlType" content="empty">
+<attribute name="part" type="NMTOKEN" use="optional"/>
+</complexType>
+</schema>
+
Modified: trunk/wsdlpull/src/schemas/schema.dtd
===================================================================
--- trunk/wsdlpull/src/schemas/schema.dtd 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/src/schemas/schema.dtd 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,398 +1,398 @@
-<!-- DTD for XML Schemas: Part 1: Structures
- Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
- Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
-<!-- Id: structures.dtd,v 1.1 2003/08/28 13:30:52 ht Exp -->
-<!-- With the exception of cases with multiple namespace
- prefixes for the XML Schema namespace, any XML document which is
- not valid per this DTD given redefinitions in its internal subset of the
- 'p' and 's' parameter entities below appropriate to its namespace
- declaration of the XML Schema namespace is almost certainly not
- a valid schema. -->
-
-<!-- The simpleType element and its constituent parts
- are defined in XML Schema: Part 2: Datatypes -->
-<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
-
-<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
- schema document to establish a different
- namespace prefix -->
-<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
- also define %s as the suffix for the appropriate
- namespace declaration (e.g. :foo) -->
-<!ENTITY % nds 'xmlns%s;'>
-
-<!-- Define all the element names, with optional prefix -->
-<!ENTITY % schema "%p;schema">
-<!ENTITY % complexType "%p;complexType">
-<!ENTITY % complexContent "%p;complexContent">
-<!ENTITY % simpleContent "%p;simpleContent">
-<!ENTITY % extension "%p;extension">
-<!ENTITY % element "%p;element">
-<!ENTITY % unique "%p;unique">
-<!ENTITY % key "%p;key">
-<!ENTITY % keyref "%p;keyref">
-<!ENTITY % selector "%p;selector">
-<!ENTITY % field "%p;field">
-<!ENTITY % group "%p;group">
-<!ENTITY % all "%p;all">
-<!ENTITY % choice "%p;choice">
-<!ENTITY % sequence "%p;sequence">
-<!ENTITY % any "%p;any">
-<!ENTITY % anyAttribute "%p;anyAttribute">
-<!ENTITY % attribute "%p;attribute">
-<!ENTITY % attributeGroup "%p;attributeGroup">
-<!ENTITY % include "%p;include">
-<!ENTITY % import "%p;import">
-<!ENTITY % redefine "%p;redefine">
-<!ENTITY % notation "%p;notation">
-
-<!-- annotation elements -->
-<!ENTITY % annotation "%p;annotation">
-<!ENTITY % appinfo "%p;appinfo">
-<!ENTITY % documentation "%p;documentation">
-
-<!-- Customisation entities for the ATTLIST of each element type.
- Define one of these if your schema takes advantage of the
- anyAttribute='##other' in the schema for schemas -->
-
-<!ENTITY % schemaAttrs ''>
-<!ENTITY % complexTypeAttrs ''>
-<!ENTITY % complexContentAttrs ''>
-<!ENTITY % simpleContentAttrs ''>
-<!ENTITY % extensionAttrs ''>
-<!ENTITY % elementAttrs ''>
-<!ENTITY % groupAttrs ''>
-<!ENTITY % allAttrs ''>
-<!ENTITY % choiceAttrs ''>
-<!ENTITY % sequenceAttrs ''>
-<!ENTITY % anyAttrs ''>
-<!ENTITY % anyAttributeAttrs ''>
-<!ENTITY % attributeAttrs ''>
-<!ENTITY % attributeGroupAttrs ''>
-<!ENTITY % uniqueAttrs ''>
-<!ENTITY % keyAttrs ''>
-<!ENTITY % keyrefAttrs ''>
-<!ENTITY % selectorAttrs ''>
-<!ENTITY % fieldAttrs ''>
-<!ENTITY % includeAttrs ''>
-<!ENTITY % importAttrs ''>
-<!ENTITY % redefineAttrs ''>
-<!ENTITY % notationAttrs ''>
-<!ENTITY % annotationAttrs ''>
-<!ENTITY % appinfoAttrs ''>
-<!ENTITY % documentationAttrs ''>
-
-<!ENTITY % complexDerivationSet "CDATA">
- <!-- #all or space-separated list drawn from derivationChoice -->
-<!ENTITY % blockSet "CDATA">
- <!-- #all or space-separated list drawn from
- derivationChoice + 'substitution' -->
-
-<!ENTITY % mgs '%all; | %choice; | %sequence;'>
-<!ENTITY % cs '%choice; | %sequence;'>
-<!ENTITY % formValues '(qualified|unqualified)'>
-
-
-<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
-
-<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
-
-<!-- This is used in part2 -->
-<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
-
-%xs-datatypes;
-
-<!-- the duplication below is to produce an unambiguous content model
- which allows annotation everywhere -->
-<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
- ((%simpleType; | %complexType;
- | %element; | %attribute;
- | %attributeGroup; | %group;
- | %notation; ),
- (%annotation;)*)* )>
-<!ATTLIST %schema;
- targetNamespace %URIref; #IMPLIED
- version CDATA #IMPLIED
- %nds; %URIref; #FIXED 'http://www.w3.org/2001/XMLSchema'
- xmlns CDATA #IMPLIED
- finalDefault %complexDerivationSet; ''
- blockDefault %blockSet; ''
- id ID #IMPLIED
- elementFormDefault %formValues; 'unqualified'
- attributeFormDefault %formValues; 'unqualified'
- xml:lang CDATA #IMPLIED
- %schemaAttrs;>
-<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
- because at the Infoset level where schemas operate,
- xmlns(:prefix) is NOT an attribute! -->
-<!-- The declaration of xmlns is a convenience for schema authors -->
-
-<!-- The id attribute here and below is for use in external references
- from non-schemas using simple fragment identifiers.
- It is NOT used for schema-to-schema reference, internal or
- external. -->
-
-<!-- a type is a named content type specification which allows attribute
- declarations-->
-<!-- -->
-
-<!ELEMENT %complexType; ((%annotation;)?,
- (%simpleContent;|%complexContent;|
- %particleAndAttrs;))>
-
-<!ATTLIST %complexType;
- name %NCName; #IMPLIED
- id ID #IMPLIED
- abstract %boolean; #IMPLIED
- final %complexDerivationSet; #IMPLIED
- block %complexDerivationSet; #IMPLIED
- mixed (true|false) 'false'
- %complexTypeAttrs;>
-
-<!-- particleAndAttrs is shorthand for a root type -->
-<!-- mixed is disallowed if simpleContent, overriden if complexContent
- has one too. -->
-
-<!-- If anyAttribute appears in one or more referenced attributeGroups
- and/or explicitly, the intersection of the permissions is used -->
-
-<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %complexContent;
- mixed (true|false) #IMPLIED
- id ID #IMPLIED
- %complexContentAttrs;>
-
-<!-- restriction should use the branch defined above, not the simple
- one from part2; extension should use the full model -->
-
-<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %simpleContent;
- id ID #IMPLIED
- %simpleContentAttrs;>
-
-<!-- restriction should use the simple branch from part2, not the
- one defined above; extension should have no particle -->
-
-<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
-<!ATTLIST %extension;
- base %QName; #REQUIRED
- id ID #IMPLIED
- %extensionAttrs;>
-
-<!-- an element is declared by either:
- a name and a type (either nested or referenced via the type attribute)
- or a ref to an existing element declaration -->
-
-<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
- (%unique; | %key; | %keyref;)*)>
-<!-- simpleType or complexType only if no type|ref attribute -->
-<!-- ref not allowed at top level -->
-<!ATTLIST %element;
- name %NCName; #IMPLIED
- id ID #IMPLIED
- ref %QName; #IMPLIED
- type %QName; #IMPLIED
- minOccurs %nonNegativeInteger; #IMPLIED
- maxOccurs CDATA #IMPLIED
- nillable %boolean; #IMPLIED
- substitutionGroup %QName; #IMPLIED
- abstract %boolean; #IMPLIED
- final %complexDerivationSet; #IMPLIED
- block %blockSet; #IMPLIED
- default CDATA #IMPLIED
- fixed CDATA #IMPLIED
- form %formValues; #IMPLIED
- %elementAttrs;>
-<!-- type and ref are mutually exclusive.
- name and ref are mutually exclusive, one is required -->
-<!-- In the absence of type AND ref, type defaults to type of
- substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
-<!-- default and fixed are mutually exclusive -->
-
-<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
-<!ATTLIST %group;
- name %NCName; #IMPLIED
- ref %QName; #IMPLIED
- minOccurs %nonNegativeInteger; #IMPLIED
- maxOccurs CDATA #IMPLIED
- id ID #IMPLIED
- %groupAttrs;>
-
-<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
-<!ATTLIST %all;
- minOccurs (1) #IMPLIED
- maxOccurs (1) #IMPLIED
- id ID #IMPLIED
- %allAttrs;>
-
-<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %choice;
- minOccurs %nonNegativeInteger; #IMPLIED
- maxOccurs CDATA #IMPLIED
- id ID #IMPLIED
- %choiceAttrs;>
-
-<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %sequence;
- minOccurs %nonNegativeInteger; #IMPLIED
- maxOccurs CDATA #IMPLIED
- id ID #IMPLIED
- %sequenceAttrs;>
-
-<!-- an anonymous grouping in a model, or
- a top-level named group definition, or a reference to same -->
-
-<!-- Note that if order is 'all', group is not allowed inside.
- If order is 'all' THIS group must be alone (or referenced alone) at
- the top level of a content model -->
-<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
-<!-- Should allow minOccurs=0 inside order='all' . . . -->
-
-<!ELEMENT %any; (%annotation;)?>
-<!ATTLIST %any;
- namespace CDATA '##any'
- processContents (skip|lax|strict) 'strict'
- minOccurs %nonNegativeInteger; '1'
- maxOccurs CDATA '1'
- id ID #IMPLIED
- %anyAttrs;>
-
-<!-- namespace is interpreted as follows:
- ##any - - any non-conflicting WFXML at all
-
- ##other - - any non-conflicting WFXML from namespace other
- than targetNamespace
-
- ##local - - any unqualified non-conflicting WFXML/attribute
- one or - - any non-conflicting WFXML from
- more URI the listed namespaces
- references
-
- ##targetNamespace ##local may appear in the above list,
- with the obvious meaning -->
-
-<!ELEMENT %anyAttribute; (%annotation;)?>
-<!ATTLIST %anyAttribute;
- namespace CDATA '##any'
- processContents (skip|lax|strict) 'strict'
- id ID #IMPLIED
- %anyAttributeAttrs;>
-<!-- namespace is interpreted as for 'any' above -->
-
-<!-- simpleType only if no type|ref attribute -->
-<!-- ref not allowed at top level, name iff at top level -->
-<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
-<!ATTLIST %attribute;
- name %NCName; #IMPLIED
- id ID #IMPLIED
- ref %QName; #IMPLIED
- type %QName; #IMPLIED
- use (prohibited|optional|required) #IMPLIED
- default CDATA #IMPLIED
- fixed CDATA #IMPLIED
- form %formValues; #IMPLIED
- %attributeAttrs;>
-<!-- type and ref are mutually exclusive.
- name and ref are mutually exclusive, one is required -->
-<!-- default for use is optional when nested, none otherwise -->
-<!-- default and fixed are mutually exclusive -->
-<!-- type attr and simpleType content are mutually exclusive -->
-
-<!-- an attributeGroup is a named collection of attribute decls, or a
- reference thereto -->
-<!ELEMENT %attributeGroup; ((%annotation;)?,
- (%attribute; | %attributeGroup;)*,
- (%anyAttribute;)?) >
-<!ATTLIST %attributeGroup;
- name %NCName; #IMPLIED
- id ID #IMPLIED
- ref %QName; #IMPLIED
- %attributeGroupAttrs;>
-
-<!-- ref iff no content, no name. ref iff not top level -->
-
-<!-- better reference mechanisms -->
-<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %unique;
- name %NCName; #REQUIRED
- id ID #IMPLIED
- %uniqueAttrs;>
-
-<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %key;
- name %NCName; #REQUIRED
- id ID #IMPLIED
- %keyAttrs;>
-
-<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %keyref;
- name %NCName; #REQUIRED
- refer %QName; #REQUIRED
- id ID #IMPLIED
- %keyrefAttrs;>
-
-<!ELEMENT %selector; ((%annotation;)?)>
-<!ATTLIST %selector;
- xpath %XPathExpr; #REQUIRED
- id ID #IMPLIED
- %selectorAttrs;>
-<!ELEMENT %field; ((%annotation;)?)>
-<!ATTLIST %field;
- xpath %XPathExpr; #REQUIRED
- id ID #IMPLIED
- %fieldAttrs;>
-
-<!-- Schema combination mechanisms -->
-<!ELEMENT %include; (%annotation;)?>
-<!ATTLIST %include;
- schemaLocation %URIref; #REQUIRED
- id ID #IMPLIED
- %includeAttrs;>
-
-<!ELEMENT %import; (%annotation;)?>
-<!ATTLIST %import;
- namespace %URIref; #IMPLIED
- schemaLocation %URIref; #IMPLIED
- id ID #IMPLIED
- %importAttrs;>
-
-<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
- %attributeGroup; | %group;)*>
-<!ATTLIST %redefine;
- schemaLocation %URIref; #REQUIRED
- id ID #IMPLIED
- %redefineAttrs;>
-
-<!ELEMENT %notation; (%annotation;)?>
-<!ATTLIST %notation;
- name %NCName; #REQUIRED
- id ID #IMPLIED
- public CDATA #REQUIRED
- system %URIref; #IMPLIED
- %notationAttrs;>
-
-<!-- Annotation is either application information or documentation -->
-<!-- By having these here they are available for datatypes as well
- as all the structures elements -->
-
-<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
-<!ATTLIST %annotation; %annotationAttrs;>
-
-<!-- User must define annotation elements in internal subset for this
- to work -->
-<!ELEMENT %appinfo; ANY> <!-- too restrictive -->
-<!ATTLIST %appinfo;
- source %URIref; #IMPLIED
- id ID #IMPLIED
- %appinfoAttrs;>
-<!ELEMENT %documentation; ANY> <!-- too restrictive -->
-<!ATTLIST %documentation;
- source %URIref; #IMPLIED
- id ID #IMPLIED
- xml:lang CDATA #IMPLIED
- %documentationAttrs;>
-
-<!NOTATION XMLSchemaStructures PUBLIC
- 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
-<!NOTATION XML PUBLIC
- 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
+<!-- DTD for XML Schemas: Part 1: Structures
+ Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
+ Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
+<!-- Id: structures.dtd,v 1.1 2003/08/28 13:30:52 ht Exp -->
+<!-- With the exception of cases with multiple namespace
+ prefixes for the XML Schema namespace, any XML document which is
+ not valid per this DTD given redefinitions in its internal subset of the
+ 'p' and 's' parameter entities below appropriate to its namespace
+ declaration of the XML Schema namespace is almost certainly not
+ a valid schema. -->
+
+<!-- The simpleType element and its constituent parts
+ are defined in XML Schema: Part 2: Datatypes -->
+<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
+
+<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
+ schema document to establish a different
+ namespace prefix -->
+<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
+ also define %s as the suffix for the appropriate
+ namespace declaration (e.g. :foo) -->
+<!ENTITY % nds 'xmlns%s;'>
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % schema "%p;schema">
+<!ENTITY % complexType "%p;complexType">
+<!ENTITY % complexContent "%p;complexContent">
+<!ENTITY % simpleContent "%p;simpleContent">
+<!ENTITY % extension "%p;extension">
+<!ENTITY % element "%p;element">
+<!ENTITY % unique "%p;unique">
+<!ENTITY % key "%p;key">
+<!ENTITY % keyref "%p;keyref">
+<!ENTITY % selector "%p;selector">
+<!ENTITY % field "%p;field">
+<!ENTITY % group "%p;group">
+<!ENTITY % all "%p;all">
+<!ENTITY % choice "%p;choice">
+<!ENTITY % sequence "%p;sequence">
+<!ENTITY % any "%p;any">
+<!ENTITY % anyAttribute "%p;anyAttribute">
+<!ENTITY % attribute "%p;attribute">
+<!ENTITY % attributeGroup "%p;attributeGroup">
+<!ENTITY % include "%p;include">
+<!ENTITY % import "%p;import">
+<!ENTITY % redefine "%p;redefine">
+<!ENTITY % notation "%p;notation">
+
+<!-- annotation elements -->
+<!ENTITY % annotation "%p;annotation">
+<!ENTITY % appinfo "%p;appinfo">
+<!ENTITY % documentation "%p;documentation">
+
+<!-- Customisation entities for the ATTLIST of each element type.
+ Define one of these if your schema takes advantage of the
+ anyAttribute='##other' in the schema for schemas -->
+
+<!ENTITY % schemaAttrs ''>
+<!ENTITY % complexTypeAttrs ''>
+<!ENTITY % complexContentAttrs ''>
+<!ENTITY % simpleContentAttrs ''>
+<!ENTITY % extensionAttrs ''>
+<!ENTITY % elementAttrs ''>
+<!ENTITY % groupAttrs ''>
+<!ENTITY % allAttrs ''>
+<!ENTITY % choiceAttrs ''>
+<!ENTITY % sequenceAttrs ''>
+<!ENTITY % anyAttrs ''>
+<!ENTITY % anyAttributeAttrs ''>
+<!ENTITY % attributeAttrs ''>
+<!ENTITY % attributeGroupAttrs ''>
+<!ENTITY % uniqueAttrs ''>
+<!ENTITY % keyAttrs ''>
+<!ENTITY % keyrefAttrs ''>
+<!ENTITY % selectorAttrs ''>
+<!ENTITY % fieldAttrs ''>
+<!ENTITY % includeAttrs ''>
+<!ENTITY % importAttrs ''>
+<!ENTITY % redefineAttrs ''>
+<!ENTITY % notationAttrs ''>
+<!ENTITY % annotationAttrs ''>
+<!ENTITY % appinfoAttrs ''>
+<!ENTITY % documentationAttrs ''>
+
+<!ENTITY % complexDerivationSet "CDATA">
+ <!-- #all or space-separated list drawn from derivationChoice -->
+<!ENTITY % blockSet "CDATA">
+ <!-- #all or space-separated list drawn from
+ derivationChoice + 'substitution' -->
+
+<!ENTITY % mgs '%all; | %choice; | %sequence;'>
+<!ENTITY % cs '%choice; | %sequence;'>
+<!ENTITY % formValues '(qualified|unqualified)'>
+
+
+<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
+
+<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
+
+<!-- This is used in part2 -->
+<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
+
+%xs-datatypes;
+
+<!-- the duplication below is to produce an unambiguous content model
+ which allows annotation everywhere -->
+<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
+ ((%simpleType; | %complexType;
+ | %element; | %attribute;
+ | %attributeGroup; | %group;
+ | %notation; ),
+ (%annotation;)*)* )>
+<!ATTLIST %schema;
+ targetNamespace %URIref; #IMPLIED
+ version CDATA #IMPLIED
+ %nds; %URIref; #FIXED 'http://www.w3.org/2001/XMLSchema'
+ xmlns CDATA #IMPLIED
+ finalDefault %complexDerivationSet; ''
+ blockDefault %blockSet; ''
+ id ID #IMPLIED
+ elementFormDefault %formValues; 'unqualified'
+ attributeFormDefault %formValues; 'unqualified'
+ xml:lang CDATA #IMPLIED
+ %schemaAttrs;>
+<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
+ because at the Infoset level where schemas operate,
+ xmlns(:prefix) is NOT an attribute! -->
+<!-- The declaration of xmlns is a convenience for schema authors -->
+
+<!-- The id attribute here and below is for use in external references
+ from non-schemas using simple fragment identifiers.
+ It is NOT used for schema-to-schema reference, internal or
+ external. -->
+
+<!-- a type is a named content type specification which allows attribute
+ declarations-->
+<!-- -->
+
+<!ELEMENT %complexType; ((%annotation;)?,
+ (%simpleContent;|%complexContent;|
+ %particleAndAttrs;))>
+
+<!ATTLIST %complexType;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %complexDerivationSet; #IMPLIED
+ mixed (true|false) 'false'
+ %complexTypeAttrs;>
+
+<!-- particleAndAttrs is shorthand for a root type -->
+<!-- mixed is disallowed if simpleContent, overriden if complexContent
+ has one too. -->
+
+<!-- If anyAttribute appears in one or more referenced attributeGroups
+ and/or explicitly, the intersection of the permissions is used -->
+
+<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %complexContent;
+ mixed (true|false) #IMPLIED
+ id ID #IMPLIED
+ %complexContentAttrs;>
+
+<!-- restriction should use the branch defined above, not the simple
+ one from part2; extension should use the full model -->
+
+<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %simpleContent;
+ id ID #IMPLIED
+ %simpleContentAttrs;>
+
+<!-- restriction should use the simple branch from part2, not the
+ one defined above; extension should have no particle -->
+
+<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
+<!ATTLIST %extension;
+ base %QName; #REQUIRED
+ id ID #IMPLIED
+ %extensionAttrs;>
+
+<!-- an element is declared by either:
+ a name and a type (either nested or referenced via the type attribute)
+ or a ref to an existing element declaration -->
+
+<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
+ (%unique; | %key; | %keyref;)*)>
+<!-- simpleType or complexType only if no type|ref attribute -->
+<!-- ref not allowed at top level -->
+<!ATTLIST %element;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ nillable %boolean; #IMPLIED
+ substitutionGroup %QName; #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %blockSet; #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %elementAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- In the absence of type AND ref, type defaults to type of
+ substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
+<!-- default and fixed are mutually exclusive -->
+
+<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
+<!ATTLIST %group;
+ name %NCName; #IMPLIED
+ ref %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %groupAttrs;>
+
+<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
+<!ATTLIST %all;
+ minOccurs (1) #IMPLIED
+ maxOccurs (1) #IMPLIED
+ id ID #IMPLIED
+ %allAttrs;>
+
+<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %choice;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %choiceAttrs;>
+
+<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %sequence;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %sequenceAttrs;>
+
+<!-- an anonymous grouping in a model, or
+ a top-level named group definition, or a reference to same -->
+
+<!-- Note that if order is 'all', group is not allowed inside.
+ If order is 'all' THIS group must be alone (or referenced alone) at
+ the top level of a content model -->
+<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
+<!-- Should allow minOccurs=0 inside order='all' . . . -->
+
+<!ELEMENT %any; (%annotation;)?>
+<!ATTLIST %any;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ minOccurs %nonNegativeInteger; '1'
+ maxOccurs CDATA '1'
+ id ID #IMPLIED
+ %anyAttrs;>
+
+<!-- namespace is interpreted as follows:
+ ##any - - any non-conflicting WFXML at all
+
+ ##other - - any non-conflicting WFXML from namespace other
+ than targetNamespace
+
+ ##local - - any unqualified non-conflicting WFXML/attribute
+ one or - - any non-conflicting WFXML from
+ more URI the listed namespaces
+ references
+
+ ##targetNamespace ##local may appear in the above list,
+ with the obvious meaning -->
+
+<!ELEMENT %anyAttribute; (%annotation;)?>
+<!ATTLIST %anyAttribute;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ id ID #IMPLIED
+ %anyAttributeAttrs;>
+<!-- namespace is interpreted as for 'any' above -->
+
+<!-- simpleType only if no type|ref attribute -->
+<!-- ref not allowed at top level, name iff at top level -->
+<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
+<!ATTLIST %attribute;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ use (prohibited|optional|required) #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %attributeAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- default for use is optional when nested, none otherwise -->
+<!-- default and fixed are mutually exclusive -->
+<!-- type attr and simpleType content are mutually exclusive -->
+
+<!-- an attributeGroup is a named collection of attribute decls, or a
+ reference thereto -->
+<!ELEMENT %attributeGroup; ((%annotation;)?,
+ (%attribute; | %attributeGroup;)*,
+ (%anyAttribute;)?) >
+<!ATTLIST %attributeGroup;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ %attributeGroupAttrs;>
+
+<!-- ref iff no content, no name. ref iff not top level -->
+
+<!-- better reference mechanisms -->
+<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %unique;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %uniqueAttrs;>
+
+<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %key;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %keyAttrs;>
+
+<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %keyref;
+ name %NCName; #REQUIRED
+ refer %QName; #REQUIRED
+ id ID #IMPLIED
+ %keyrefAttrs;>
+
+<!ELEMENT %selector; ((%annotation;)?)>
+<!ATTLIST %selector;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %selectorAttrs;>
+<!ELEMENT %field; ((%annotation;)?)>
+<!ATTLIST %field;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %fieldAttrs;>
+
+<!-- Schema combination mechanisms -->
+<!ELEMENT %include; (%annotation;)?>
+<!ATTLIST %include;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %includeAttrs;>
+
+<!ELEMENT %import; (%annotation;)?>
+<!ATTLIST %import;
+ namespace %URIref; #IMPLIED
+ schemaLocation %URIref; #IMPLIED
+ id ID #IMPLIED
+ %importAttrs;>
+
+<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
+ %attributeGroup; | %group;)*>
+<!ATTLIST %redefine;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %redefineAttrs;>
+
+<!ELEMENT %notation; (%annotation;)?>
+<!ATTLIST %notation;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ public CDATA #REQUIRED
+ system %URIref; #IMPLIED
+ %notationAttrs;>
+
+<!-- Annotation is either application information or documentation -->
+<!-- By having these here they are available for datatypes as well
+ as all the structures elements -->
+
+<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
+<!ATTLIST %annotation; %annotationAttrs;>
+
+<!-- User must define annotation elements in internal subset for this
+ to work -->
+<!ELEMENT %appinfo; ANY> <!-- too restrictive -->
+<!ATTLIST %appinfo;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ %appinfoAttrs;>
+<!ELEMENT %documentation; ANY> <!-- too restrictive -->
+<!ATTLIST %documentation;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ xml:lang CDATA #IMPLIED
+ %documentationAttrs;>
+
+<!NOTATION XMLSchemaStructures PUBLIC
+ 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
+<!NOTATION XML PUBLIC
+ 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
Modified: trunk/wsdlpull/src/schemas/soap-encoding.xsd
===================================================================
--- trunk/wsdlpull/src/schemas/soap-encoding.xsd 2010-07-18 16:35:47 UTC (rev 198)
+++ trunk/wsdlpull/src/schemas/soap-encoding.xsd 2010-07-18 17:23:15 UTC (rev 199)
@@ -1,536 +1,536 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!-- Schema for the SOAP/1.1 encoding
-
- This schema has been produced using W3C's SOAP Version 1.2 schema
- found at:
-
- http://www.w3.org/2001/06/soap-encoding
-
- Copyright 2001 Martin Gudgin, Developmentor.
- http://www.develop.co.uk
-
- Changes made are the following:
- - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
- - reverted root to only allow 0 and 1 as lexical values
-
- Further changes:
-
- - removed default value from root attribute declaration - 20030314
-
- Original copyright:
-
- Copyright 2001 W3C (Massachusetts Institute of Technology,
- Institut National de Recherche en Informatique et en Automatique,
- Keio University). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/
-
- This document is governed by the W3C Software License [1] as
- described in the FAQ [2].
-
- [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
- [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://schemas.xmlsoap.org/soap/encoding/"
- targetNamespace="http://schemas.xmlsoap.org/soap/encoding/" >
-
- <xs:attribute name="root" >
- <xs:annotation>
- <xs:documentation>
- 'root' can be used to distinguish serialization roots from other
- elements that are present in a serialization but are not roots of
- a serialized value graph
- </xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base='xs:boolean'>
- <xs:pattern value='0|1' />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
-
- <xs:attributeGroup name="commonAttributes" >
- <xs:annotation>
- <xs:documentation>
- Attributes common to all elements that function as accessors or
- represent independent (multi-ref) values. The href attribute is
- intended to be used in a manner like CONREF. That is, the element
- content should be empty iff the href attribute appears
- </xs:documentation>
- </xs:annotation>
- <xs:attribute name="id" type="xs:ID" />
- <xs:attribute name="href" type="xs:anyURI" />
- <xs:anyAttribute namespace="##other" processContents="lax" />
- </xs:attributeGroup>
-
- <!-- Global Attributes. The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
-
- <!-- Array attributes. Needed to give the type and dimensions of an array's contents, and the offset for partially-transmitted arrays. -->
-
- <xs:simpleType name="arrayCoordinate" >
- <xs:restriction base="xs:string" />
- </xs:simpleType>
-
- <xs:attribute name="arrayType" type="xs:string" />
- <xs:attribute name="offset" type="tns:arrayCoordinate" />
-
- <xs:attributeGroup name="arrayAttributes" >
- <xs:attribute ref="tns:arrayType" />
- <xs:attribute ref="tns:offset" />
- </xs:attributeGroup>
-
- <xs:attribute name="position" type="tns:arrayCoordinate" />
-
- <xs:attributeGroup name="arrayMemberAttributes" >
- <xs:attribute ref="tns:position" />
- </xs:attributeGroup>
-
- <xs:group name="Array" >
- <xs:sequence>
- <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
- </xs:sequence>
- </xs:group>
-
- <xs:element name="Array" type="tns:Array" />
- <xs:complexType name="Array" >
- <xs:annotation>
- <xs:documentation>
- 'Array' is a complex type for accessors identified by position
- </xs:documentation>
- </xs:annotation>
- <xs:group ref="tns:Array" minOccurs="0" />
- <xs:attributeGroup ref="tns:arrayAttributes" />
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:complexType>
-
- <!-- 'Struct' is a complex type for accessors identified by name.
- Constraint: No element may be have the same name as any other,
- nor may any element have a maxOccurs > 1. -->
-
- <xs:element name="Struct" type="tns:Struct" />
-
- <xs:group name="Struct" >
- <xs:sequence>
- <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="Struct" >
- <xs:group ref="tns:Struct" minOccurs="0" />
- <xs:attributeGroup ref="tns:commonAttributes"/>
- </xs:complexType>
-
- <!-- 'Base64' can be used to serialize binary data using base64 encoding
- as defined in RFC2045 but without the MIME line length limitation. -->
-
- <xs:simpleType name="base64" >
- <xs:restriction base="xs:base64Binary" />
- </xs:simpleType>
-
- <!-- Element declarations corresponding to each of the simple types in the
- XML Schemas Specification. -->
-
- <xs:element name="duration" type="tns:duration" />
- <xs:complexType name="duration" >
- <xs:simpleContent>
- <xs:extension base="xs:duration" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="dateTime" type="tns:dateTime" />
- <xs:complexType name="dateTime" >
- <xs:simpleContent>
- <xs:extension base="xs:dateTime" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
-
-
- <xs:element name="NOTATION" type="tns:NOTATION" />
- <xs:complexType name="NOTATION" >
- <xs:simpleContent>
- <xs:extension base="xs:QName" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
-
- <xs:element name="time" type="tns:time" />
- <xs:complexType name="time" >
- <xs:simpleContent>
- <xs:extension base="xs:time" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="date" type="tns:date" />
- <xs:complexType name="date" >
- <xs:simpleContent>
- <xs:extension base="xs:date" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="gYearMonth" type="tns:gYearMonth" />
- <xs:complexType name="gYearMonth" >
- <xs:simpleContent>
- <xs:extension base="xs:gYearMonth" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="gYear" type="tns:gYear" />
- <xs:complexType name="gYear" >
- <xs:simpleContent>
- <xs:extension base="xs:gYear" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="gMonthDay" type="tns:gMonthDay" />
- <xs:complexType name="gMonthDay" >
- <xs:simpleContent>
- <xs:extension base="xs:gMonthDay" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="gDay" type="tns:gDay" />
- <xs:complexType name="gDay" >
- <xs:simpleContent>
- <xs:extension base="xs:gDay" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="gMonth" type="tns:gMonth" />
- <xs:complexType name="gMonth" >
- <xs:simpleContent>
- <xs:extension base="xs:gMonth" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="boolean" type="tns:boolean" />
- <xs:complexType name="boolean" >
- <xs:simpleContent>
- <xs:extension base="xs:boolean" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="base64Binary" type="tns:base64Binary" />
- <xs:complexType name="base64Binary" >
- <xs:simpleContent>
- <xs:extension base="xs:base64Binary" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="hexBinary" type="tns:hexBinary" />
- <xs:complexType name="hexBinary" >
- <xs:simpleContent>
- <xs:extension base="xs:hexBinary" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="float" type="tns:float" />
- <xs:complexType name="float" >
- <xs:simpleContent>
- <xs:extension base="xs:float" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="double" type="tns:double" />
- <xs:complexType name="double" >
- <xs:simpleContent>
- <xs:extension base="xs:double" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="anyURI" type="tns:anyURI" />
- <xs:complexType name="anyURI" >
- <xs:simpleContent>
- <xs:extension base="xs:anyURI" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="QName" type="tns:QName" />
- <xs:complexType name="QName" >
- <xs:simpleContent>
- <xs:extension base="xs:QName" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
-
- <xs:element name="string" type="tns:string" />
- <xs:complexType name="string" >
- <xs:simpleContent>
- <xs:extension base="xs:string" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="normalizedString" type="tns:normalizedString" />
- <xs:complexType name="normalizedString" >
- <xs:simpleContent>
- <xs:extension base="xs:normalizedString" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="token" type="tns:token" />
- <xs:complexType name="token" >
- <xs:simpleContent>
- <xs:extension base="xs:token" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="language" type="tns:language" />
- <xs:complexType name="language" >
- <xs:simpleContent>
- <xs:extension base="xs:language" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="Name" type="tns:Name" />
- <xs:complexType name="Name" >
- <xs:simpleContent>
- <xs:extension base="xs:Name" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="NMTOKEN" type="tns:NMTOKEN" />
- <xs:complexType name="NMTOKEN" >
- <xs:simpleContent>
- <xs:extension base="xs:NMTOKEN" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="NCName" type="tns:NCName" />
- <xs:complexType name="NCName" >
- <xs:simpleContent>
- <xs:extension base="xs:NCName" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="NMTOKENS" type="tns:NMTOKENS" />
- <xs:complexType name="NMTOKENS" >
- <xs:simpleContent>
- <xs:extension base="xs:NMTOKENS" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="ID" type="tns:ID" />
- <xs:complexType name="ID" >
- <xs:simpleContent>
- <xs:extension base="xs:ID" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="IDREF" type="tns:IDREF" />
- <xs:complexType name="IDREF" >
- <xs:simpleContent>
- <xs:extension base="xs:IDREF" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="ENTITY" type="tns:ENTITY" />
- <xs:complexType name="ENTITY" >
- <xs:simpleContent>
- <xs:extension base="xs:ENTITY" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="IDREFS" type="tns:IDREFS" />
- <xs:complexType name="IDREFS" >
- <xs:simpleContent>
- <xs:extension base="xs:IDREFS" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="ENTITIES" type="tns:ENTITIES" />
- <xs:complexType name="ENTITIES" >
- <xs:simpleContent>
- <xs:extension base="xs:ENTITIES" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="decimal" type="tns:decimal" />
- <xs:complexType name="decimal" >
- <xs:simpleContent>
- <xs:extension base="xs:decimal" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="integer" type="tns:integer" />
- <xs:complexType name="integer" >
- <xs:simpleContent>
- <xs:extension base="xs:integer" >
- <xs:attributeGroup ref="tns:commonAttributes" />
- </xs:extension>
- </x...
[truncated message content] |
|
From: <den...@us...> - 2010-07-18 16:35:54
|
Revision: 198
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=198&view=rev
Author: denis_arnaud
Date: 2010-07-18 16:35:47 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
[Dev] The names of binaries and libraries are now prefixed with wsdlpull.
Modified Paths:
--------------
trunk/wsdlpull/Makefile.am
trunk/wsdlpull/autogen.sh
trunk/wsdlpull/configure.in
trunk/wsdlpull/docs/Makefile.am
trunk/wsdlpull/examples/Makefile.am
trunk/wsdlpull/examples/gsoap/Makefile.am
trunk/wsdlpull/examples/print/Makefile.am
trunk/wsdlpull/examples/schema/Makefile.am
trunk/wsdlpull/examples/stocks/Makefile.am
trunk/wsdlpull/examples/xml/Makefile.am
trunk/wsdlpull/man/Makefile.am
trunk/wsdlpull/src/Makefile.am
trunk/wsdlpull/src/schemaparser/Makefile.am
trunk/wsdlpull/src/schemas/Makefile.am
trunk/wsdlpull/src/tools/Makefile.am
trunk/wsdlpull/src/utils/Makefile.am
trunk/wsdlpull/src/wsdlparser/Makefile.am
trunk/wsdlpull/src/xmlpull/Makefile.am
trunk/wsdlpull/src/xmlpull/XmlSerializer.cpp
trunk/wsdlpull/src/xmlpull/XmlSerializer.h
Property Changed:
----------------
trunk/wsdlpull/src/tools/
Modified: trunk/wsdlpull/Makefile.am
===================================================================
--- trunk/wsdlpull/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,22 +1,6 @@
-#***************************************************************************
-#
-# Project wsdlpull
-# Copyright (C) 2004, Vivek Krishna, <viv...@us...>
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-###########################################################################
+## wsdlpull
+AUTOMAKE_OPTIONS = dist-bzip2
-AUTOMAKE_OPTIONS = foreign dist-bzip2
-
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
src/config-h.in config/stamp-h.in
Modified: trunk/wsdlpull/autogen.sh
===================================================================
--- trunk/wsdlpull/autogen.sh 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/autogen.sh 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,5 @@
#! /bin/sh
-# $Id: autogen.sh,v 1.4 2002/12/02 01:39:49 murrayc Exp $
-#
# Copyright (c) 2002 Daniel Elstner <dan...@gm...>
#
# This program is free software; you can redistribute it and/or modify
Modified: trunk/wsdlpull/configure.in
===================================================================
--- trunk/wsdlpull/configure.in 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/configure.in 2010-07-18 16:35:47 UTC (rev 198)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Vivek Krishna <viv...@us...>])
-AC_INIT([WSDLPull],[1.23],[viv...@us...],[wsdlpull])
+AC_INIT([WSDLPull],[1.24],[viv...@us...],[wsdlpull])
AC_CONFIG_HEADER([src/config.h])
AC_CONFIG_SRCDIR([src/wsdlparser/WsdlParser.cpp])
AC_CONFIG_AUX_DIR([config])
@@ -13,7 +13,7 @@
# Configure file for wsdlpull
# Shared library versioning
-GENERIC_LIBRARY_VERSION="1:23:0"
+GENERIC_LIBRARY_VERSION="1:24:0"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/wsdlpull/docs/Makefile.am
===================================================================
--- trunk/wsdlpull/docs/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/docs/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -5,6 +5,8 @@
include $(top_srcdir)/src/schemaparser/sources.mk
include $(top_srcdir)/src/tools/sources.mk
+MAINTAINERCLEANFILES = Makefile.in
+
docdir = @docdir@
html_tarname = @PACKAGE_TARNAME@-doc-@PACKAGE_VERSION@
@@ -46,3 +48,4 @@
clean-local:
rm -rf html *.log *.tag
+
Modified: trunk/wsdlpull/examples/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,6 +1,7 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
SUBDIRS = print xml stocks
Modified: trunk/wsdlpull/examples/gsoap/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/gsoap/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/gsoap/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,26 +1,34 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/gsoap
+## This is the input file for automake, which will generate Makefile.in ##
-CPPFLAGS = -DDATADIR=\"$(bindir)/\" @CPPFLAGS@
+MAINTAINERCLEANFILES = Makefile.in
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
+#
+pkginclude_HEADERS = gsoap.h
+pkgincludedir = $(includedir)/wsdlpull/examples
-pkginclude_HEADERS = gsoap.h
-pkgincludedir= $(includedir)/examples
+#
+bin_SCRIPTS = typedefs.h mainStart.stub mainEnd.stub includes.h
-bin_SCRIPTS=typedefs.h mainStart.stub mainEnd.stub includes.h
-
+#
lib_LTLIBRARIES = libwsdl2gsoap.la
-libwsdl2gsoap_la_SOURCES=gsoap.cpp gsoap_utility.cpp gsoap.h
+libwsdl2gsoap_la_SOURCES = gsoap.cpp gsoap_utility.cpp gsoap.h
-bin_PROGRAMS=wsdl2cpp
-wsdl2cpp_SOURCES = driver.cpp
-wsdl2cpp_LDADD= $(top_builddir)/examples/gsoap/libwsdl2gsoap.la $(top_builddir)/src/wsdlparser/libwsdl.la $(top_builddir)/src/schemaparser/libschema.la $(top_builddir)/src/xmlpull/libxmlpull.la $(top_builddir)/src/utils/libutils.la
+#
+bin_PROGRAMS = wsdl2cpp
+wsdl2cpp_SOURCES = driver.cpp
+wsdl2cpp_CPPFLAGS = -DDATADIR=\"$(bindir)/\"
+wsdl2cpp_LDFLAGS = \
+ $(top_builddir)/examples/gsoap/libwsdl2gsoap.la \
+ $(top_builddir)/src/wsdlparser/libwsdl.la \
+ $(top_builddir)/src/schemaparser/libschema.la \
+ $(top_builddir)/src/xmlpull/libxmlpull.la \
+ $(top_builddir)/src/utils/libutils.la
+#
+docsdir = $(prefix)/docs
+docs_DATA = README_gsoap.txt
-docsdir=$(prefix)/docs
-docs_DATA=README_gsoap.txt
+EXTRA_DIST = $(docs_DATA) \
+ typedefs.h mainStart.stub mainEnd.stub includes.h wsdl2cpp.dsp
-EXTRA_DIST=typedefs.h mainStart.stub mainEnd.stub includes.h wsdl2cpp.dsp $(docs_DATA)
Modified: trunk/wsdlpull/examples/print/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/print/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/print/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,16 +1,21 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/print
+## This is the input file for automake, which will generate Makefile.in ##
-CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
+MAINTAINERCLEANFILES = Makefile.in
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-LDADD=$(top_builddir)/src/wsdlparser/libwsdl.la $(top_builddir)/src/schemaparser/libschema.la $(top_builddir)/src/xmlpull/libxmlpull.la
-bin_PROGRAMS=print
+#
+bin_PROGRAMS = print
-print_SOURCES = print.cpp
+print_SOURCES = print.cpp
+print_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
+print_LDFLAGS = \
+ $(top_builddir)/src/wsdlparser/libwsdlpull.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la
-docsdir=$(prefix)/docs
-docs_DATA=README_print.txt
-EXTRA_DIST=$(docs_DATA)
+#
+docsdir = $(prefix)/docs
+docs_DATA = README_print.txt
+
+EXTRA_DIST = $(docs_DATA)
+
Modified: trunk/wsdlpull/examples/schema/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/schema/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/schema/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,15 +1,21 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/schema
+## This is the input file for automake, which will generate Makefile.in ##
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-LDADD=$(top_builddir)/src/schemaparser/libschema.la $(top_builddir)/src/xmlpull/libxmlpull.la $(top_builddir)/src/utils/libutils.la
+MAINTAINERCLEANFILES = Makefile.in
-bin_PROGRAMS=schema
+#
+bin_PROGRAMS = schema
-schema_SOURCES = schema.cpp
+schema_SOURCES = schema.cpp
+schema_LDFLAGS = \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ $(top_builddir)/src/utils/libwsdlpullutils.la
-docsdir=$(prefix)/docs
-docs_DATA=README_schema.txt
-EXTRA_DIST=schema.dsp complexTypes.xsd first-building-blocks.xsd first-complex-types.xsd list.xsd po.xsd simpleTypes.xsd first.xml list.xml $(docs_DATA)
+#
+docsdir = $(prefix)/docs
+docs_DATA = README_schema.txt
+EXTRA_DIST = $(docs_DATA) \
+ schema.dsp complexTypes.xsd first-building-blocks.xsd first-complex-types.xsd \
+ list.xsd po.xsd simpleTypes.xsd first.xml list.xml
+
Modified: trunk/wsdlpull/examples/stocks/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/stocks/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/stocks/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,12 +1,15 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/stocks
+## This is the input file for automake, which will generate Makefile.in ##
-CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
+MAINTAINERCLEANFILES = Makefile.in
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-LDADD=$(top_builddir)/src/wsdlparser/libwsdl.la $(top_builddir)/src/schemaparser/libschema.la $(top_builddir)/src/xmlpull/libxmlpull.la
-bin_PROGRAMS=stocks
+#
+bin_PROGRAMS = stocks
-stocks_SOURCES=stocks.cpp
+stocks_SOURCES = stocks.cpp
+stocks_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
+stocks_LDFLAGS = \
+ $(top_builddir)/src/wsdlparser/libwsdlpull.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la
+
Modified: trunk/wsdlpull/examples/xml/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/xml/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/xml/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,10 +1,11 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/xml
+## This is the input file for automake, which will generate Makefile.in ##
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-LDADD=$(top_builddir)/src/xmlpull/libxmlpull.la
+MAINTAINERCLEANFILES = Makefile.in
-bin_PROGRAMS=roundtrip
-roundtrip_SOURCES =roundtrip.cpp
+#
+bin_PROGRAMS = roundtrip
+
+roundtrip_SOURCES = roundtrip.cpp
+roundtrip_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la
+
Modified: trunk/wsdlpull/man/Makefile.am
===================================================================
--- trunk/wsdlpull/man/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/man/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,4 +1,8 @@
# Man pages
+
+MAINTAINERCLEANFILES = Makefile.in
+
man_MANS = wsdlpull.1 wsdlpull-schema.1 wsdlpull-config.1
EXTRA_DIST = $(man_MANS)
+
Modified: trunk/wsdlpull/src/Makefile.am
===================================================================
--- trunk/wsdlpull/src/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,22 +1,7 @@
-#***************************************************************************
+# wsdlpull/src
#
-# Project wsdlpull
-# Copyright (C) 2004, Vivek Krishna, <viv...@us...>
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-###########################################################################
-AUTOMAKE_OPTIONS = foreign
+MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = xmlpull schemaparser wsdlparser schemas tools
-MAINTAINERCLEANFILES = Makefile.in
Modified: trunk/wsdlpull/src/schemaparser/Makefile.am
===================================================================
--- trunk/wsdlpull/src/schemaparser/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/schemaparser/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,4 @@
## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in
@@ -11,11 +8,12 @@
INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
-lib_LTLIBRARIES = libschema.la
+lib_LTLIBRARIES = libwsdlpullschema.la
-libschema_la_SOURCES = $(schema_h_sources) $(schema_cc_sources)
-libschema_la_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
+libwsdlpullschema_la_SOURCES = $(schema_h_sources) $(schema_cc_sources)
+libwsdlpullschema_la_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
-version-info $(GENERIC_LIBRARY_VERSION)
pkginclude_HEADERS = $(schema_h_sources)
-pkgincludedir= $(includedir)/schemaparser
+pkgincludedir= $(includedir)/wsdlpull/schemaparser
+
Modified: trunk/wsdlpull/src/schemas/Makefile.am
===================================================================
--- trunk/wsdlpull/src/schemas/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/schemas/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,8 @@
-## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## This is the input file for automake, which will generate Makefile.in ##
-pkginclude_HEADERS = soap.xsd wsdl10.xsd mime.xsd http.xsd soap-encoding.xsd schema.dtd schema.conf soap12.xsd soap-encoding12.xsd
+MAINTAINERCLEANFILES = Makefile.in
+
+pkginclude_HEADERS = soap.xsd wsdl10.xsd mime.xsd http.xsd soap-encoding.xsd \
+ schema.dtd schema.conf soap12.xsd soap-encoding12.xsd
pkgincludedir= $(datadir)/wsdlpull
+
Property changes on: trunk/wsdlpull/src/tools
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile
Makefile.in
schema
wsdl
+ .deps
.libs
Makefile
Makefile.in
wsdlpull
wsdlpull-schema
Modified: trunk/wsdlpull/src/tools/Makefile.am
===================================================================
--- trunk/wsdlpull/src/tools/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/tools/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,4 @@
## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in
@@ -16,12 +13,14 @@
## Dynamic Web service invocation
wsdlpull_SOURCES = $(wsdltool_cc_sources)
-wsdlpull_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la \
- $(top_builddir)/src/wsdlparser/libwsdl.la
+wsdlpull_LDFLAGS = \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/wsdlparser/libwsdlpull.la
## Schema validation tool
wsdlpull_schema_SOURCES = $(schematool_cc_sources)
-wsdlpull_schema_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la
+wsdlpull_schema_LDFLAGS = \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la
Modified: trunk/wsdlpull/src/utils/Makefile.am
===================================================================
--- trunk/wsdlpull/src/utils/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/utils/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,10 +1,12 @@
+## wsdlpull/utils
## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-lib_LTLIBRARIES = libutils.la
-libutils_la_SOURCES=utils.h utility.cpp net.cpp
+MAINTAINERCLEANFILES = Makefile.in
+
+#
+lib_LTLIBRARIES = libwsdlpullutils.la
+libwsdlpullutils_la_SOURCES = utils.h utility.cpp net.cpp
+
pkginclude_HEADERS = utils.h
-pkgincludedir= $(includedir)/utils
+pkgincludedir= $(includedir)/wsdlpull/utils
+
Modified: trunk/wsdlpull/src/wsdlparser/Makefile.am
===================================================================
--- trunk/wsdlpull/src/wsdlparser/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/wsdlparser/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,4 @@
## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in
@@ -11,12 +8,13 @@
INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
-lib_LTLIBRARIES = libwsdl.la
+lib_LTLIBRARIES = libwsdlpull.la
-libwsdl_la_SOURCES = $(wsdl_h_sources) $(wsdl_cc_sources)
-libwsdl_la_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la \
+libwsdlpull_la_SOURCES = $(wsdl_h_sources) $(wsdl_cc_sources)
+libwsdlpull_la_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
-version-info $(GENERIC_LIBRARY_VERSION)
pkginclude_HEADERS = $(schema_h_sources)
-pkgincludedir= $(includedir)/wsdlparser
+pkgincludedir= $(includedir)/wsdlpull/wsdlparser
+
Modified: trunk/wsdlpull/src/xmlpull/Makefile.am
===================================================================
--- trunk/wsdlpull/src/xmlpull/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/xmlpull/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,19 +1,17 @@
-## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-
-MAINTAINERCLEANFILES = Makefile.in
-
-# src/xmlpull
-include $(srcdir)/sources.mk
-
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
-
-lib_LTLIBRARIES = libxmlpull.la
-
-libxmlpull_la_SOURCES = $(xmlpull_h_sources) $(xmlpull_cc_sources)
-libxmlpull_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-
-pkginclude_HEADERS = $(xmlpull_h_sources)
-pkgincludedir= $(includedir)/xmlpull
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+# src/xmlpull
+include $(srcdir)/sources.mk
+
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
+
+lib_LTLIBRARIES = libwsdlpullxml.la
+
+libwsdlpullxml_la_SOURCES = $(xmlpull_h_sources) $(xmlpull_cc_sources)
+libwsdlpullxml_la_LDFLAGS = -lpthread -version-info $(GENERIC_LIBRARY_VERSION)
+
+pkginclude_HEADERS = $(xmlpull_h_sources)
+pkgincludedir= $(includedir)/wsdlpull/xml
+
Modified: trunk/wsdlpull/src/xmlpull/XmlSerializer.cpp
===================================================================
--- trunk/wsdlpull/src/xmlpull/XmlSerializer.cpp 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/xmlpull/XmlSerializer.cpp 2010-07-18 16:35:47 UTC (rev 198)
@@ -276,7 +276,7 @@
if (prefix==defined)
return;
- int pos = (nspCounts[depth + 1]++) << 1;
+ unsigned int pos = (nspCounts[depth + 1]++) << 1;
if (nspStack.size() < pos + 1) {
nspStack.resize(nspStack.size() + 16);
@@ -320,11 +320,11 @@
if (indent[depth]) {
writer<<"\r\n";
- for (int i = 0; i < depth; i++)
+ for (unsigned int i = 0; i < depth; i++)
writer<<" ";
}
- int esp = depth * 3;
+ unsigned int esp = depth * 3;
if (elementStack.size() < esp + 3) {
elementStack.resize(elementStack.size() + 16);
}
@@ -440,7 +440,7 @@
else {
if (indent[depth + 1]) {
writer<<"\r\n";
- for (int i = 0; i < depth; i++)
+ for (unsigned int i = 0; i < depth; i++)
writer<<" ";
}
Modified: trunk/wsdlpull/src/xmlpull/XmlSerializer.h
===================================================================
--- trunk/wsdlpull/src/xmlpull/XmlSerializer.h 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/xmlpull/XmlSerializer.h 2010-07-18 16:35:47 UTC (rev 198)
@@ -71,7 +71,7 @@
std::ostream& writer;
bool pending;
int auto_;
- int depth;
+ unsigned int depth;
std::string encoding;
std::vector<std::string> elementStack,nspStack;
//nsp/prefix/name
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-18 15:51:20
|
Revision: 197
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=197&view=rev
Author: denis_arnaud
Date: 2010-07-18 15:51:14 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
[Dev] Fixed a compilation error (PATH_MAX) and a compilation warning (&& || in a if clause).
Modified Paths:
--------------
trunk/wsdlpull/src/schemaparser/SchemaParser.cpp
trunk/wsdlpull/src/xmlpull/XmlUtils.cpp
Modified: trunk/wsdlpull/src/schemaparser/SchemaParser.cpp
===================================================================
--- trunk/wsdlpull/src/schemaparser/SchemaParser.cpp 2010-07-13 22:51:54 UTC (rev 196)
+++ trunk/wsdlpull/src/schemaparser/SchemaParser.cpp 2010-07-18 15:51:14 UTC (rev 197)
@@ -834,10 +834,11 @@
xParser_->nextTag();
std::string elemName=xParser_->getName();
if (xParser_->getEventType() == xParser_->END_TAG) {
- if (cstr==Schema::Key && elemName == "key" ||
- cstr==Schema::Keyref && elemName == "keyref" ||
- cstr==Schema::Unique && elemName == "unique" )
+ if ((cstr==Schema::Key && elemName == "key")
+ || (cstr==Schema::Keyref && elemName == "keyref")
+ || (cstr==Schema::Unique && elemName == "unique")) {
break;
+ }
//if an end tag is seen proceed till next start tag
while (xParser_->getEventType() != xParser_->START_TAG)
Modified: trunk/wsdlpull/src/xmlpull/XmlUtils.cpp
===================================================================
--- trunk/wsdlpull/src/xmlpull/XmlUtils.cpp 2010-07-13 22:51:54 UTC (rev 196)
+++ trunk/wsdlpull/src/xmlpull/XmlUtils.cpp 2010-07-18 15:51:14 UTC (rev 197)
@@ -36,15 +36,15 @@
#include <unistd.h>
#include <errno.h>
#include <pthread.h>
-#include <stdlib.h>
+#include <cstdlib>
#endif
#ifdef WITH_CURL
#include <curl/curl.h>
#endif
-#include <time.h>
-#include <cstdlib>
+#include <ctime>
+#include <climits>
#include <cstring>
#include <fstream>
#include <sstream>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-13 22:52:01
|
Revision: 196
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=196&view=rev
Author: denis_arnaud
Date: 2010-07-13 22:51:54 +0000 (Tue, 13 Jul 2010)
Log Message:
-----------
[RPM Packaging] Integrated comments from Patrick Monnerat (bug #502686).
Modified Paths:
--------------
trunk/wsdlpull/Makefile.am
trunk/wsdlpull/configure.in
trunk/wsdlpull/wsdlpull.spec
Modified: trunk/wsdlpull/Makefile.am
===================================================================
--- trunk/wsdlpull/Makefile.am 2010-07-13 22:51:07 UTC (rev 195)
+++ trunk/wsdlpull/Makefile.am 2010-07-13 22:51:54 UTC (rev 196)
@@ -15,7 +15,7 @@
#
###########################################################################
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign dist-bzip2
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
src/config-h.in config/stamp-h.in
Modified: trunk/wsdlpull/configure.in
===================================================================
--- trunk/wsdlpull/configure.in 2010-07-13 22:51:07 UTC (rev 195)
+++ trunk/wsdlpull/configure.in 2010-07-13 22:51:54 UTC (rev 196)
@@ -1,10 +1,17 @@
-# Configure file for wsdlpull
+# Process this file with autoconf to produce a configure script
+#-------------------------------------------------------------------
+AC_PREREQ(2.59)
+AC_COPYRIGHT([Copyright (C) 2007-2010 Vivek Krishna <viv...@us...>])
AC_INIT([WSDLPull],[1.23],[viv...@us...],[wsdlpull])
AC_CONFIG_HEADER([src/config.h])
AC_CONFIG_SRCDIR([src/wsdlparser/WsdlParser.cpp])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE
+#AM_PATH_CPPUNIT(1.10)
+#AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
+# Configure file for wsdlpull
+
# Shared library versioning
GENERIC_LIBRARY_VERSION="1:23:0"
# | | |
@@ -21,6 +28,37 @@
# or changed
AC_SUBST(GENERIC_LIBRARY_VERSION)
+# Check for host and disable building a shared library in Windows
+AC_CANONICAL_HOST
+case $host in
+ *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+ AC_DISABLE_SHARED
+ AC_ENABLE_STATIC
+ ;;
+ *)
+ AC_ENABLE_SHARED
+ AC_DISABLE_STATIC
+ ;;
+esac
+
+# Checks for programs.
+save_CFLAGS="$CFLAGS"
+save_CXXFLAGS="$CXXFLAGS"
+AC_PROG_CXX
+AC_PROG_CXXCPP
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+CXXFLAGS="$save_CXXFLAGS"
+CFLAGS="$save_CFLAGS"
+AC_PROG_LN_S
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+
+# Set default language to C++
+AC_LANG([C++])
+
AC_ARG_WITH(log,
[ --with-log compile with logging information on],
AC_DEFINE([LOGGING],,[Whether to compile with logging information])
@@ -39,45 +77,32 @@
fi
AC_SUBST(docdir)
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_LN_S
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-
-# Checks for header files. Doesnt work correctly may be we need to give the absolute path of the header files!!
-#AC_HEADER_STDC
-#AC_CHECK_HEADERS(string,,AC_MSG_ERROR(STL-string class missing?))
-#AC_CHECK_HEADERS(list,,AC_MSG_ERROR(STL-list class missing?))
-#AC_CHECK_HEADERS(vector,,AC_MSG_ERROR(STL-vector class missing?))
-#AC_CHECK_HEADERS(iostream,,AC_MSG_ERROR(STL-iostream class missing?))
-#AC_CHECK_HEADERS(fstream,,AC_MSG_ERROR(STL-fstream class missing?))
-
-# Checks for the c++ compiler
-AC_LANG_CPLUSPLUS
-
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
-AC_HEADER_TIME
AC_STRUCT_TM
#AC_C_CONST
#AC_C_INLINE
AM_WITH_DMALLOC
-AC_DEFUN([OPT_DISABLE], [
- AC_ARG_ENABLE([opt], AC_HELP_STRING([--disable-opt], [ removes compiler optimization flag for debugging purposes ]),
- [CXXFLAGS="-g -O0 -Wall"
- CFLAGS="-g -O0 -Wall"
-],
- [CXXFLAGS="-O2 -Wall" CFLAGS="-O2 -Wall"])
-])
+# Checks for header files
+AC_HEADER_STDC
+AC_HEADER_TIME
+AC_CHECK_HEADERS([ fstream \
+ iostream \
+ list \
+ vector \
+ string])
-OPT_DISABLE
+# Default compilation flags
+if test -z "${CFLAGS}"; then
+ CFLAGS="-g -Wall"
+fi
+if test -z "${CXXFLAGS}"; then
+ CXXFLAGS="-g -Wall"
+fi
+
AC_CHECK_HEADERS(getopt.h,,AC_MSG_WARN(getopt.h missing))
AC_CHECK_FUNCS(getopt_long,
[AC_DEFINE(HAVE_GETOPT_LONG, 1, long getopt support)],
@@ -165,7 +190,6 @@
- CFLAGS ............ : ${CFLAGS}
- CXXFLAGS .......... : ${CXXFLAGS}
- CPPFLAGS .......... : ${CPPFLAGS}
- - FFLAGS ............ : ${FFLAGS}
- LDFLAGS ........... : ${LDFLAGS}
- LIBS .............. : ${LIBS}
Modified: trunk/wsdlpull/wsdlpull.spec
===================================================================
--- trunk/wsdlpull/wsdlpull.spec 2010-07-13 22:51:07 UTC (rev 195)
+++ trunk/wsdlpull/wsdlpull.spec 2010-07-13 22:51:54 UTC (rev 196)
@@ -6,23 +6,24 @@
#
%global mydocs __tmp_docdir
#
-Summary: C++ Web Services client library
Name: wsdlpull
Version: 1.23
-Release: 2%{?dist}
+Release: 3%{?dist}
+
+Summary: C++ Web Services client library
+
+Group: System Environment/Libraries
License: LGPLv2 and OReilly and MIT
-Group: System Environment/Libraries
URL: http://%{name}.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
# That patch will be submitted upstream
Patch0: wsdlpull-%{version}-fix-gcc43-compatibility.patch
# That patch will be submitted upstream
Patch1: wsdlpull-%{version}-add-man-pages.patch
# That patch will be submitted upstream
Patch2: wsdlpull-%{version}-fix-gnu-autotools-compatibility.patch
-# Some documentation files are still DOS-formatted
-BuildRequires: dos2unix
%description
%{name} is a C++ web services client library. It includes a WSDL
@@ -69,10 +70,10 @@
%patch1 -p1
# Remove any CVS sub-directory (they should not be delivered with the tar-ball)
-find . -name 'CVS' -print | xargs %{__rm} -rf
+find . -name 'CVS' -print | xargs -r %{__rm} -rf
# Remove any a.out binary (they should not be delivered with the tar-ball)
-find . -name 'a.out' -print | xargs %{__rm} -f
+find . -name 'a.out' -print | xargs -r %{__rm} -f
# Remove the generated HTML documentation (it should not be delivered
# with the tar-ball, as it is generated)
@@ -88,7 +89,7 @@
# Rename the standard documentation files
%{__mv} AUTHORS.txt AUTHORS
-dos2unix AUTHORS
+sed -i -e 's/\r$//' AUTHORS
%{__mv} CHANGES.txt CHANGES
%{__mv} COPYING.txt COPYING
%{__mv} README.txt README
@@ -98,7 +99,7 @@
%build
%configure --disable-static
-make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
+make %{?_smp_mflags}
%install
%{__rm} -rf $RPM_BUILD_ROOT
@@ -130,7 +131,6 @@
%files devel
%defattr(-,root,root,-)
-%doc AUTHORS CHANGES COPYING README
%{_includedir}/schemaparser
%{_includedir}/wsdlparser
%{_includedir}/xmlpull
@@ -143,6 +143,10 @@
%changelog
+* Tue Jul 14 2010 Denis Arnaud <den...@m4...> 1.23-3
+- Integrated Patrick Monnerat's remarks
+ (https://bugzilla.redhat.com/show_bug.cgi?id=502686#c13)
+
* Tue Jul 11 2010 Denis Arnaud <den...@m4...> 1.23-2
- Integrated Patrick Monnerat's remarks
(https://bugzilla.redhat.com/show_bug.cgi?id=502686#c6)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-13 22:51:14
|
Revision: 195
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=195&view=rev
Author: denis_arnaud
Date: 2010-07-13 22:51:07 +0000 (Tue, 13 Jul 2010)
Log Message:
-----------
[RPM Packaging] Integrated comments from Patrick Monnerat (bug #502686).
Modified Paths:
--------------
branches/wsdlpull-1.23/Makefile.am
branches/wsdlpull-1.23/configure.in
branches/wsdlpull-1.23/wsdlpull.spec
Modified: branches/wsdlpull-1.23/Makefile.am
===================================================================
--- branches/wsdlpull-1.23/Makefile.am 2010-07-11 19:27:39 UTC (rev 194)
+++ branches/wsdlpull-1.23/Makefile.am 2010-07-13 22:51:07 UTC (rev 195)
@@ -15,7 +15,7 @@
#
###########################################################################
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign dist-bzip2
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
src/config-h.in config/stamp-h.in
Modified: branches/wsdlpull-1.23/configure.in
===================================================================
--- branches/wsdlpull-1.23/configure.in 2010-07-11 19:27:39 UTC (rev 194)
+++ branches/wsdlpull-1.23/configure.in 2010-07-13 22:51:07 UTC (rev 195)
@@ -1,10 +1,17 @@
-# Configure file for wsdlpull
+# Process this file with autoconf to produce a configure script
+#-------------------------------------------------------------------
+AC_PREREQ(2.59)
+AC_COPYRIGHT([Copyright (C) 2007-2010 Vivek Krishna <viv...@us...>])
AC_INIT([WSDLPull],[1.23],[viv...@us...],[wsdlpull])
AC_CONFIG_HEADER([src/config.h])
AC_CONFIG_SRCDIR([src/wsdlparser/WsdlParser.cpp])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE
+#AM_PATH_CPPUNIT(1.10)
+#AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
+# Configure file for wsdlpull
+
# Shared library versioning
GENERIC_LIBRARY_VERSION="1:23:0"
# | | |
@@ -21,6 +28,37 @@
# or changed
AC_SUBST(GENERIC_LIBRARY_VERSION)
+# Check for host and disable building a shared library in Windows
+AC_CANONICAL_HOST
+case $host in
+ *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+ AC_DISABLE_SHARED
+ AC_ENABLE_STATIC
+ ;;
+ *)
+ AC_ENABLE_SHARED
+ AC_DISABLE_STATIC
+ ;;
+esac
+
+# Checks for programs.
+save_CFLAGS="$CFLAGS"
+save_CXXFLAGS="$CXXFLAGS"
+AC_PROG_CXX
+AC_PROG_CXXCPP
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+CXXFLAGS="$save_CXXFLAGS"
+CFLAGS="$save_CFLAGS"
+AC_PROG_LN_S
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+
+# Set default language to C++
+AC_LANG([C++])
+
AC_ARG_WITH(log,
[ --with-log compile with logging information on],
AC_DEFINE([LOGGING],,[Whether to compile with logging information])
@@ -39,45 +77,32 @@
fi
AC_SUBST(docdir)
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_LN_S
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-
-# Checks for header files. Doesnt work correctly may be we need to give the absolute path of the header files!!
-#AC_HEADER_STDC
-#AC_CHECK_HEADERS(string,,AC_MSG_ERROR(STL-string class missing?))
-#AC_CHECK_HEADERS(list,,AC_MSG_ERROR(STL-list class missing?))
-#AC_CHECK_HEADERS(vector,,AC_MSG_ERROR(STL-vector class missing?))
-#AC_CHECK_HEADERS(iostream,,AC_MSG_ERROR(STL-iostream class missing?))
-#AC_CHECK_HEADERS(fstream,,AC_MSG_ERROR(STL-fstream class missing?))
-
-# Checks for the c++ compiler
-AC_LANG_CPLUSPLUS
-
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
-AC_HEADER_TIME
AC_STRUCT_TM
#AC_C_CONST
#AC_C_INLINE
AM_WITH_DMALLOC
-AC_DEFUN([OPT_DISABLE], [
- AC_ARG_ENABLE([opt], AC_HELP_STRING([--disable-opt], [ removes compiler optimization flag for debugging purposes ]),
- [CXXFLAGS="-g -O0 -Wall"
- CFLAGS="-g -O0 -Wall"
-],
- [CXXFLAGS="-O2 -Wall" CFLAGS="-O2 -Wall"])
-])
+# Checks for header files
+AC_HEADER_STDC
+AC_HEADER_TIME
+AC_CHECK_HEADERS([ fstream \
+ iostream \
+ list \
+ vector \
+ string])
-OPT_DISABLE
+# Default compilation flags
+if test -z "${CFLAGS}"; then
+ CFLAGS="-g -Wall"
+fi
+if test -z "${CXXFLAGS}"; then
+ CXXFLAGS="-g -Wall"
+fi
+
AC_CHECK_HEADERS(getopt.h,,AC_MSG_WARN(getopt.h missing))
AC_CHECK_FUNCS(getopt_long,
[AC_DEFINE(HAVE_GETOPT_LONG, 1, long getopt support)],
@@ -165,7 +190,6 @@
- CFLAGS ............ : ${CFLAGS}
- CXXFLAGS .......... : ${CXXFLAGS}
- CPPFLAGS .......... : ${CPPFLAGS}
- - FFLAGS ............ : ${FFLAGS}
- LDFLAGS ........... : ${LDFLAGS}
- LIBS .............. : ${LIBS}
Modified: branches/wsdlpull-1.23/wsdlpull.spec
===================================================================
--- branches/wsdlpull-1.23/wsdlpull.spec 2010-07-11 19:27:39 UTC (rev 194)
+++ branches/wsdlpull-1.23/wsdlpull.spec 2010-07-13 22:51:07 UTC (rev 195)
@@ -6,23 +6,24 @@
#
%global mydocs __tmp_docdir
#
-Summary: C++ Web Services client library
Name: wsdlpull
Version: 1.23
-Release: 2%{?dist}
+Release: 3%{?dist}
+
+Summary: C++ Web Services client library
+
+Group: System Environment/Libraries
License: LGPLv2 and OReilly and MIT
-Group: System Environment/Libraries
URL: http://%{name}.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
# That patch will be submitted upstream
Patch0: wsdlpull-%{version}-fix-gcc43-compatibility.patch
# That patch will be submitted upstream
Patch1: wsdlpull-%{version}-add-man-pages.patch
# That patch will be submitted upstream
Patch2: wsdlpull-%{version}-fix-gnu-autotools-compatibility.patch
-# Some documentation files are still DOS-formatted
-BuildRequires: dos2unix
%description
%{name} is a C++ web services client library. It includes a WSDL
@@ -69,10 +70,10 @@
%patch1 -p1
# Remove any CVS sub-directory (they should not be delivered with the tar-ball)
-find . -name 'CVS' -print | xargs %{__rm} -rf
+find . -name 'CVS' -print | xargs -r %{__rm} -rf
# Remove any a.out binary (they should not be delivered with the tar-ball)
-find . -name 'a.out' -print | xargs %{__rm} -f
+find . -name 'a.out' -print | xargs -r %{__rm} -f
# Remove the generated HTML documentation (it should not be delivered
# with the tar-ball, as it is generated)
@@ -88,7 +89,7 @@
# Rename the standard documentation files
%{__mv} AUTHORS.txt AUTHORS
-dos2unix AUTHORS
+sed -i -e 's/\r$//' AUTHORS
%{__mv} CHANGES.txt CHANGES
%{__mv} COPYING.txt COPYING
%{__mv} README.txt README
@@ -98,7 +99,7 @@
%build
%configure --disable-static
-make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
+make %{?_smp_mflags}
%install
%{__rm} -rf $RPM_BUILD_ROOT
@@ -130,7 +131,6 @@
%files devel
%defattr(-,root,root,-)
-%doc AUTHORS CHANGES COPYING README
%{_includedir}/schemaparser
%{_includedir}/wsdlparser
%{_includedir}/xmlpull
@@ -143,6 +143,10 @@
%changelog
+* Tue Jul 14 2010 Denis Arnaud <den...@m4...> 1.23-3
+- Integrated Patrick Monnerat's remarks
+ (https://bugzilla.redhat.com/show_bug.cgi?id=502686#c13)
+
* Tue Jul 11 2010 Denis Arnaud <den...@m4...> 1.23-2
- Integrated Patrick Monnerat's remarks
(https://bugzilla.redhat.com/show_bug.cgi?id=502686#c6)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-11 19:27:47
|
Revision: 194
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=194&view=rev
Author: denis_arnaud
Date: 2010-07-11 19:27:39 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
[Dev] Added man pages and updated the Id of some files to reflect latest upstream changes.
Modified Paths:
--------------
trunk/wsdlpull/wsdlpull.spec
Modified: trunk/wsdlpull/wsdlpull.spec
===================================================================
--- trunk/wsdlpull/wsdlpull.spec 2010-07-11 19:27:23 UTC (rev 193)
+++ trunk/wsdlpull/wsdlpull.spec 2010-07-11 19:27:39 UTC (rev 194)
@@ -9,27 +9,30 @@
Summary: C++ Web Services client library
Name: wsdlpull
Version: 1.23
-Release: 1%{?dist}
-License: LGPLv2
+Release: 2%{?dist}
+License: LGPLv2 and OReilly and MIT
Group: System Environment/Libraries
URL: http://%{name}.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# That patch will be submitted upstream
-Patch0: wsdlpull-%{version}-1-fix-gcc43-compatibility.patch
+Patch0: wsdlpull-%{version}-fix-gcc43-compatibility.patch
# That patch will be submitted upstream
-Patch1: wsdlpull-%{version}-1-fix-gnu-autotools-compatibility.patch
-#BuildRequires:
+Patch1: wsdlpull-%{version}-add-man-pages.patch
+# That patch will be submitted upstream
+Patch2: wsdlpull-%{version}-fix-gnu-autotools-compatibility.patch
+# Some documentation files are still DOS-formatted
+BuildRequires: dos2unix
%description
-wsdlpull is a C++ web services client library. It includes a WSDL
+%{name} is a C++ web services client library. It includes a WSDL
Parser, a XSD Schema Parser and Validator and XML Parser and serializer
and an API and command line tool for dynamic WSDL inspection and
invocation.
-wsdlpull comes with a generic web service client.Using wsdlpull's /wsdl/
-tool you can invoke most web services from command line without writing
-any code.
+%{name} comes with a generic web service client. Using %{name} tools,
+you can invoke most Web services from command line without writing any
+code. See http://wsdlpull.sourceforge.net for usage.
%package devel
Summary: Header files, libraries and development documentation for %{name}
@@ -46,15 +49,8 @@
Group: Documentation
%if 0%{?fedora} >= 10
BuildArch: noarch
-BuildRequires: texlive-latex, texlive-dvips, texlive-utils
%endif
-%if 0%{?fedora} < 10
-BuildRequires: tetex-latex, tetex-dvips
-%endif
-%{?el5:BuildRequires: tetex-latex, tetex-dvips}
BuildRequires: doxygen
-#BuildRequires: graphviz
-#BuildRequires: ghostscript
%description doc
This package contains the documentation in the HTML format of the %{name}
@@ -66,52 +62,55 @@
# Apply the g++ 4.3 compatibility patch
%patch0 -p1
+# Create a directory for man pages
+%{__mkdir} man
+
+# Apply the man page patch
+%patch1 -p1
+
# Remove any CVS sub-directory (they should not be delivered with the tar-ball)
-find . -name 'CVS' -print | xargs rm -rf
+find . -name 'CVS' -print | xargs %{__rm} -rf
# Remove any a.out binary (they should not be delivered with the tar-ball)
-find . -name 'a.out' -print | xargs rm -f
+find . -name 'a.out' -print | xargs %{__rm} -f
# Remove the generated HTML documentation (it should not be delivered
# with the tar-ball, as it is generated)
if [ -d docs/html ]; then
- rm -rf docs/html
+ %{__rm} -rf docs/html
fi
# Adapt a little bit the structure, so as to be more compliant with
# GNU Autotools
-mkdir config
-mv config.guess config.sub depcomp install-sh ltmain.sh missing config
-mv config.h.in src
+%{__mkdir} config
+%{__mv} config.guess config.sub depcomp install-sh ltmain.sh missing config
+%{__mv} config.h.in src
# Rename the standard documentation files
-mv AUTHORS.txt AUTHORS
-mv CHANGES.txt CHANGES
-mv COPYING.txt COPYING
-mv README.txt README
+%{__mv} AUTHORS.txt AUTHORS
+dos2unix AUTHORS
+%{__mv} CHANGES.txt CHANGES
+%{__mv} COPYING.txt COPYING
+%{__mv} README.txt README
# Apply the GNU Autotools compatibility patch
-%patch1 -p1
+%patch2 -p1
%build
%configure --disable-static
-make %{?_smp_mflags}
+make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-#%%find_lang %{name}
-# remove unpackaged files from the buildroot
-#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
-#rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
-rm -rf %{mydocs} && mkdir -p %{mydocs}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
+# Remove unpackaged files from the buildroot
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{mydocs} && %{__mkdir_p} %{mydocs}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
@@ -121,9 +120,12 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES COPYING README
-%{_bindir}/schema
-%{_bindir}/wsdl
+%{_bindir}/%{name}
+%{_bindir}/%{name}-schema
%{_libdir}/lib*.so.*
+%{_mandir}/man1/%{name}.1.*
+%{_mandir}/man1/%{name}-config.1.*
+%{_mandir}/man1/%{name}-schema.1.*
%{_datadir}/%{name}
%files devel
@@ -136,10 +138,14 @@
%files doc
%defattr(-,root,root,-)
+%doc AUTHORS CHANGES COPYING README
%doc %{mydocs}/html
-%doc AUTHORS CHANGES COPYING README
%changelog
+* Tue Jul 11 2010 Denis Arnaud <den...@m4...> 1.23-2
+- Integrated Patrick Monnerat's remarks
+ (https://bugzilla.redhat.com/show_bug.cgi?id=502686#c6)
+
* Tue Jun 26 2009 Denis Arnaud <den...@m4...> 1.23-1
- Initial package, thanks to Dries Verachtert <dr...@ul...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-11 19:27:29
|
Revision: 193
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=193&view=rev
Author: denis_arnaud
Date: 2010-07-11 19:27:23 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
[Release 1.23] Added man pages and updated the Id of some files to reflect latest upstream changes.
Modified Paths:
--------------
branches/wsdlpull-1.23/wsdlpull.spec
Modified: branches/wsdlpull-1.23/wsdlpull.spec
===================================================================
--- branches/wsdlpull-1.23/wsdlpull.spec 2010-07-11 19:26:33 UTC (rev 192)
+++ branches/wsdlpull-1.23/wsdlpull.spec 2010-07-11 19:27:23 UTC (rev 193)
@@ -16,9 +16,11 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# That patch will be submitted upstream
-Patch0: wsdlpull-%{version}-%{release}-fix-gcc43-compatibility.patch
+Patch0: wsdlpull-%{version}-fix-gcc43-compatibility.patch
# That patch will be submitted upstream
-Patch1: wsdlpull-%{version}-%{release}-fix-gnu-autotools-compatibility.patch
+Patch1: wsdlpull-%{version}-add-man-pages.patch
+# That patch will be submitted upstream
+Patch2: wsdlpull-%{version}-fix-gnu-autotools-compatibility.patch
# Some documentation files are still DOS-formatted
BuildRequires: dos2unix
@@ -28,9 +30,9 @@
and an API and command line tool for dynamic WSDL inspection and
invocation.
-%{name} comes with a generic web service client. Using %{name}'s /wsdl/
-tool you can invoke most web services from command line without writing
-any code.
+%{name} comes with a generic web service client. Using %{name} tools,
+you can invoke most Web services from command line without writing any
+code. See http://wsdlpull.sourceforge.net for usage.
%package devel
Summary: Header files, libraries and development documentation for %{name}
@@ -60,6 +62,12 @@
# Apply the g++ 4.3 compatibility patch
%patch0 -p1
+# Create a directory for man pages
+%{__mkdir} man
+
+# Apply the man page patch
+%patch1 -p1
+
# Remove any CVS sub-directory (they should not be delivered with the tar-ball)
find . -name 'CVS' -print | xargs %{__rm} -rf
@@ -86,7 +94,7 @@
%{__mv} README.txt README
# Apply the GNU Autotools compatibility patch
-%patch1 -p1
+%patch2 -p1
%build
%configure --disable-static
@@ -112,11 +120,13 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES COPYING README
-%{_bindir}/schema
-%{_bindir}/wsdl
+%{_bindir}/%{name}
+%{_bindir}/%{name}-schema
%{_libdir}/lib*.so.*
%{_mandir}/man1/%{name}.1.*
-%dir %{_datadir}/%{name}
+%{_mandir}/man1/%{name}-config.1.*
+%{_mandir}/man1/%{name}-schema.1.*
+%{_datadir}/%{name}
%files devel
%defattr(-,root,root,-)
@@ -139,4 +149,3 @@
* Tue Jun 26 2009 Denis Arnaud <den...@m4...> 1.23-1
- Initial package, thanks to Dries Verachtert <dr...@ul...>
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-11 19:26:40
|
Revision: 192
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=192&view=rev
Author: denis_arnaud
Date: 2010-07-11 19:26:33 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
[Dev] Added man pages and updated the Id of some files to reflect latest upstream changes.
Modified Paths:
--------------
trunk/wsdlpull/Makefile.am
trunk/wsdlpull/configure.in
trunk/wsdlpull/src/schemas/soap-encoding12.xsd
trunk/wsdlpull/src/tools/Makefile.am
trunk/wsdlpull/tests/schema/block.xsd
trunk/wsdlpull/tests/schema/choice.xsd
trunk/wsdlpull/tests/schema/complexTypes.xsd
trunk/wsdlpull/tests/schema/first-building-blocks.xsd
trunk/wsdlpull/tests/schema/first-complex-types.xsd
trunk/wsdlpull/tests/schema/first.xml
trunk/wsdlpull/tests/schema/first.xsd
trunk/wsdlpull/tests/schema/import.xsd
trunk/wsdlpull/tests/schema/list.xsd
trunk/wsdlpull/tests/schema/simpleTypes.xsd
trunk/wsdlpull/win32/curl/curl.h
trunk/wsdlpull/win32/curl/curlbuild.h
trunk/wsdlpull/win32/curl/curlrules.h
trunk/wsdlpull/win32/curl/curlver.h
trunk/wsdlpull/win32/curl/easy.h
trunk/wsdlpull/win32/curl/mprintf.h
trunk/wsdlpull/win32/curl/multi.h
trunk/wsdlpull/win32/curl/stdcheaders.h
trunk/wsdlpull/win32/curl/typecheck-gcc.h
trunk/wsdlpull/wsdlpull.spec
Added Paths:
-----------
trunk/wsdlpull/man/
trunk/wsdlpull/man/Makefile.am
trunk/wsdlpull/man/wsdlpull-config.1
trunk/wsdlpull/man/wsdlpull-schema.1
trunk/wsdlpull/man/wsdlpull.1
Property Changed:
----------------
trunk/wsdlpull/examples/gsoap/
Modified: trunk/wsdlpull/Makefile.am
===================================================================
--- trunk/wsdlpull/Makefile.am 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/Makefile.am 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,36 +1,36 @@
-#***************************************************************************
-#
-# Project wsdlpull
-# Copyright (C) 2004, Vivek Krishna, <viv...@us...>
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-###########################################################################
-
-AUTOMAKE_OPTIONS = foreign
-
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
- src/config-h.in config/stamp-h.in
-
-if EXAMPLES
-SUBDIRS = src tests docs win32 examples
-else
-SUBDIRS = src tests docs win32
-endif
-
-docsdir = $(datadir)/wsdlpull
-docs_DATA = wsdlpull.html README
-
-EXTRA_DIST = AUTHORS COPYING CHANGES $(docs_DATA)
-
-#pkginclude_HEADERS = src/config.h
-pkgincludedir= $(includedir)
-
+#***************************************************************************
+#
+# Project wsdlpull
+# Copyright (C) 2004, Vivek Krishna, <viv...@us...>
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+###########################################################################
+
+AUTOMAKE_OPTIONS = foreign
+
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
+ src/config-h.in config/stamp-h.in
+
+if EXAMPLES
+SUBDIRS = src tests docs man win32 examples
+else
+SUBDIRS = src tests docs man win32
+endif
+
+docsdir = $(datadir)/wsdlpull
+docs_DATA = wsdlpull.html README
+
+EXTRA_DIST = AUTHORS COPYING CHANGES $(docs_DATA)
+
+#pkginclude_HEADERS = src/config.h
+pkgincludedir= $(includedir)
+
Modified: trunk/wsdlpull/configure.in
===================================================================
--- trunk/wsdlpull/configure.in 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/configure.in 2010-07-11 19:26:33 UTC (rev 192)
@@ -104,4 +104,78 @@
AM_CONDITIONAL(EXAMPLES,test "$build_examples" = yes)
-AC_OUTPUT([ Makefile docs/Makefile win32/Makefile win32/curl/Makefile win32/vs2005/Makefile win32/vs2008/Makefile src/Makefile src/xmlpull/Makefile src/schemaparser/Makefile src/wsdlparser/Makefile src/tools/Makefile examples/Makefile examples/print/Makefile examples/xml/Makefile examples/stocks/Makefile src/schemas/Makefile tests/Makefile tests/schema/Makefile tests/wsdl/Makefile])
+AC_OUTPUT([
+Makefile
+docs/Makefile
+man/Makefile
+win32/Makefile
+win32/curl/Makefile
+win32/vs2005/Makefile
+win32/vs2008/Makefile
+src/Makefile
+src/xmlpull/Makefile
+src/schemaparser/Makefile
+src/wsdlparser/Makefile
+src/tools/Makefile
+examples/Makefile
+examples/print/Makefile
+examples/xml/Makefile
+examples/stocks/Makefile
+src/schemas/Makefile
+tests/Makefile
+tests/schema/Makefile
+tests/wsdl/Makefile
+])
+
+echo "
+------------------------------------------------------------------------------
+$PACKAGE-$VERSION library configuration:
+------------------------------------------------------------------------------
+
+Directories:
+ - prefix ............ : ${prefix}
+ - exec_prefix ....... : ${exec_prefix}
+ - includedir ........ : ${includedir}
+ - libdir ............ : ${libdir}
+ - docdir ............ : ${docdir}
+ - mandir ............ : ${mandir}
+ - infodir ........... : ${infodir}
+
+Switches:
+ - exceptions ........ : ${enable_exceptions}
+ - use-nls ........... : ${USE_NLS}
+ - info-doc .......... : ${enable_info_doc}
+ - html-doc .......... : ${enable_html_doc}
+ - shared ............ : ${enable_shared}
+ - static ............ : ${enable_static}
+
+Documentation tools:
+ - texinfo ........... : ${texinfo_ok}
+ - doxygen ........... : ${doxygen_ok}
+ - latex ............. : ${latex_ok}
+ - dvips ............. : ${dvips_ok}
+ - ghostscript ....... : ${gs_ok}
+
+Testing tools:
+ - diff .............. : ${diff_ok}
+ - sed ............... : ${sed_ok}
+
+Compiler/linker flags/libs/defs:
+ - CXX ............... : ${CXX}
+ - CFLAGS ............ : ${CFLAGS}
+ - CXXFLAGS .......... : ${CXXFLAGS}
+ - CPPFLAGS .......... : ${CPPFLAGS}
+ - FFLAGS ............ : ${FFLAGS}
+ - LDFLAGS ........... : ${LDFLAGS}
+ - LIBS .............. : ${LIBS}
+
+External libraries:
+ - CPPUNIT ........... :
+ o CPPUNIT_VERSION . : ${CPPUNIT_VERSION}
+ o CPPUNIT_CFLAGS .. : ${CPPUNIT_CFLAGS}
+ o CPPUNIT_LIBS .... : ${CPPUNIT_LIBS}
+
+------------------------------------------------------------------------------
+Now type 'make && make install' to build and install $PACKAGE-$VERSION library
+------------------------------------------------------------------------------
+"
Property changes on: trunk/wsdlpull/examples/gsoap
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Property changes on: trunk/wsdlpull/man
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Added: trunk/wsdlpull/man/Makefile.am
===================================================================
--- trunk/wsdlpull/man/Makefile.am (rev 0)
+++ trunk/wsdlpull/man/Makefile.am 2010-07-11 19:26:33 UTC (rev 192)
@@ -0,0 +1,4 @@
+# Man pages
+man_MANS = wsdlpull.1 wsdlpull-schema.1 wsdlpull-config.1
+
+EXTRA_DIST = $(man_MANS)
Added: trunk/wsdlpull/man/wsdlpull-config.1
===================================================================
--- trunk/wsdlpull/man/wsdlpull-config.1 (rev 0)
+++ trunk/wsdlpull/man/wsdlpull-config.1 2010-07-11 19:26:33 UTC (rev 192)
@@ -0,0 +1,37 @@
+.TH WSDLPull 1 "11 July 2010"
+.SH NAME
+wsdlpull-config - script to get version number and compiler flags of the installed WSDLPull library
+.SH SYNOPSIS
+.B wsdlpull-config
+[\-\-prefix] [\-\-version] [\-\-libs] [\-\-cflags]
+.SH DESCRIPTION
+.PP
+\fIwsdlpull-config\fP is a tool that is used by configure to determine
+the compiler and linker flags that should be used to compile
+and link programs that use \fIWSDLPull\fP. It is also used internally
+by the GNU autoconf .m4 macros that are included with \fIWSDLPull\fP.
+.
+.SH OPTIONS
+\fIwsdlpull-config\fP accepts the following options:
+.TP 8
+.B \-\-version
+Print the currently installed version of \fIWSDLPull\fP on the standard output.
+.TP 8
+.B \-\-libs
+Print the linker flags that are necessary to link a \fIWSDLPull\fP program
+.TP 8
+.B \-\-cflags
+Print the compiler flags that are necessary to compile a \fIWSDLPull\fP program.
+.TP 8
+.B \-\-prefix
+Show the WSDLPull installation prefix.
+.SH SEE ALSO
+.BR curl (1),
+.SH COPYRIGHT
+Copyright \(co 2010 Vivek Krishna
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
Added: trunk/wsdlpull/man/wsdlpull-schema.1
===================================================================
--- trunk/wsdlpull/man/wsdlpull-schema.1 (rev 0)
+++ trunk/wsdlpull/man/wsdlpull-schema.1 2010-07-11 19:26:33 UTC (rev 192)
@@ -0,0 +1,20 @@
+.TH Wsdlpull-Schema 1 "Web Services Schema Parser" "Wsdlpull Team" \" -*- nroff -*-
+.SH NAME
+wsdlpull-schema - C++ Web Services Schema Parser
+.SH SYNOPSIS
+#include <schemaparser/...>
+.SH DESCRIPTION
+WSDLPull includes a schema parser. That schema parser can be used in
+isolation to parse XSD schemas. The schema parser can validate an
+instance document of the XSD schema just parsed.
+.PP
+The library covers the following areas,
+.TP
+.nf
+.BR
+WSDL (Web Services Description Language)
+XSD Schema
+.fi
+.PP
+Please report any bugs to
+.B https://sourceforge.net/tracker/?group_id=96736&atid=615728
Added: trunk/wsdlpull/man/wsdlpull.1
===================================================================
--- trunk/wsdlpull/man/wsdlpull.1 (rev 0)
+++ trunk/wsdlpull/man/wsdlpull.1 2010-07-11 19:26:33 UTC (rev 192)
@@ -0,0 +1,23 @@
+.TH WSDLPull 1 "C++ Web Services Client Library" "WSDLPull Team" \" -*- nroff -*-
+.SH NAME
+wsdlpull - C++ Web Services Library
+.SH SYNOPSIS
+#include <wsdlpull/...>
+.SH DESCRIPTION
+wsdlpull is a C++ web services client library. It includes a WSDL
+Parser, a XML Schema parser and validator and an XML Parser and
+serializer. It has an API and command line tool for dynamic WSDL
+inspection and invocation. The command line tool is a generic web
+service client using which you can invoke most web services from
+command line without writing any code.
+.PP
+The library covers the following areas,
+.TP
+.nf
+.BR
+WSDL (Web Services Description Language)
+XSD Schema
+.fi
+.PP
+Please report any bugs to
+.B https://sourceforge.net/tracker/?group_id=96736&atid=615728
Modified: trunk/wsdlpull/src/schemas/soap-encoding12.xsd
===================================================================
--- trunk/wsdlpull/src/schemas/soap-encoding12.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/src/schemas/soap-encoding12.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,7 +1,7 @@
<!-- Schema defined in the SOAP Version 1.2 Part 2 specification
Recommendation at
http://www.w3.org/TR/2003/REC-soap12-part2-20030624/
- $Id: soap-encoding12.xsd,v 1.1 2008-11-01 20:08:41 vivek200120 Exp $
+ $Id: soap-encoding12.xsd,v 1.1 2008/11/01 20:08:41 vivek200120 Exp $
Copyright (C)2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
W3C viability, trademark, document use and software licensing rules
Modified: trunk/wsdlpull/src/tools/Makefile.am
===================================================================
--- trunk/wsdlpull/src/tools/Makefile.am 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/src/tools/Makefile.am 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,27 +1,27 @@
-## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-
-MAINTAINERCLEANFILES = Makefile.in
-
-# src/xmlpull
-include $(srcdir)/sources.mk
-
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
-CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
-
-## WSDL Invocation stuff
-bin_PROGRAMS = wsdl schema
-
-## Dynamic Web service invocation
-wsdl_SOURCES = $(wsdltool_cc_sources)
-wsdl_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la \
- $(top_builddir)/src/wsdlparser/libwsdl.la
-
-## Schema validation tool
-schema_SOURCES = $(schematool_cc_sources)
-schema_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la
-
+## This is the input file for automake, which will generate Makefile.in ##
+## not a GNU package. You can remove this line, if
+## you have all needed files, that a GNU package needs
+AUTOMAKE_OPTIONS = foreign
+
+MAINTAINERCLEANFILES = Makefile.in
+
+# src/xmlpull
+include $(srcdir)/sources.mk
+
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
+CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
+
+## WSDL Invocation stuff
+bin_PROGRAMS = wsdlpull wsdlpull-schema
+
+## Dynamic Web service invocation
+wsdlpull_SOURCES = $(wsdltool_cc_sources)
+wsdlpull_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
+ $(top_builddir)/src/schemaparser/libschema.la \
+ $(top_builddir)/src/wsdlparser/libwsdl.la
+
+## Schema validation tool
+wsdlpull_schema_SOURCES = $(schematool_cc_sources)
+wsdlpull_schema_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
+ $(top_builddir)/src/schemaparser/libschema.la
+
Modified: trunk/wsdlpull/tests/schema/block.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/block.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/block.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/block.xsd,v 1.1 2008-05-03 11:13:33 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/block.xsd,v 1.1 2008/05/03 11:13:33 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="name" type="xs:token"/>
Modified: trunk/wsdlpull/tests/schema/choice.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/choice.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/choice.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/choice.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/choice.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="string255">
Modified: trunk/wsdlpull/tests/schema/complexTypes.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/complexTypes.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/complexTypes.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/complexTypes.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/complexTypes.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
Modified: trunk/wsdlpull/tests/schema/first-building-blocks.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/first-building-blocks.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/first-building-blocks.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/first-building-blocks.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/first-building-blocks.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="simpleTypes.xsd"/>
Modified: trunk/wsdlpull/tests/schema/first-complex-types.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/first-complex-types.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/first-complex-types.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/first-complex-types.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/first-complex-types.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<!-- Copyright O'Reilly -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
Modified: trunk/wsdlpull/tests/schema/first.xml
===================================================================
--- trunk/wsdlpull/tests/schema/first.xml 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/first.xml 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/first.xml,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/first.xml,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<!-- Copyright O'Reilly -->
<library>
<book id="b0836217462" available="true">
Modified: trunk/wsdlpull/tests/schema/first.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/first.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/first.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/first.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/first.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="simpleTypes.xsd"/>
Modified: trunk/wsdlpull/tests/schema/import.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/import.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/import.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/import.xsd,v 1.1 2008-06-15 17:35:23 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/import.xsd,v 1.1 2008/06/15 17:35:23 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdlpull/import" xmlns:imp1="http://wsdlpull/import1" tns="http://wsdlpull/import">
<xs:import namespace="http://wsdlpull/import1" schemaLocation="import1.xsd"/>
Modified: trunk/wsdlpull/tests/schema/list.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/list.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/list.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/list.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/list.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:simpleType name="USState">
<xsd:restriction base="xsd:string">
Modified: trunk/wsdlpull/tests/schema/simpleTypes.xsd
===================================================================
--- trunk/wsdlpull/tests/schema/simpleTypes.xsd 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/tests/schema/simpleTypes.xsd 2010-07-11 19:26:33 UTC (rev 192)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/simpleTypes.xsd,v 1.2 2008-12-11 04:18:07 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/simpleTypes.xsd,v 1.2 2008/12/11 04:18:07 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="string255">
Modified: trunk/wsdlpull/win32/curl/curl.h
===================================================================
--- trunk/wsdlpull/win32/curl/curl.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/curl.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: curl.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: curl.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/*
Modified: trunk/wsdlpull/win32/curl/curlbuild.h
===================================================================
--- trunk/wsdlpull/win32/curl/curlbuild.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/curlbuild.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: curlbuild.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: curlbuild.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/* ================================================================ */
Modified: trunk/wsdlpull/win32/curl/curlrules.h
===================================================================
--- trunk/wsdlpull/win32/curl/curlrules.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/curlrules.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: curlrules.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: curlrules.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/* ================================================================ */
Modified: trunk/wsdlpull/win32/curl/curlver.h
===================================================================
--- trunk/wsdlpull/win32/curl/curlver.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/curlver.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: curlver.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: curlver.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/* This header file contains nothing but libcurl version info, generated by
Modified: trunk/wsdlpull/win32/curl/easy.h
===================================================================
--- trunk/wsdlpull/win32/curl/easy.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/easy.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: easy.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: easy.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
#ifdef __cplusplus
extern "C" {
Modified: trunk/wsdlpull/win32/curl/mprintf.h
===================================================================
--- trunk/wsdlpull/win32/curl/mprintf.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/mprintf.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: mprintf.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: mprintf.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
#include <stdarg.h>
Modified: trunk/wsdlpull/win32/curl/multi.h
===================================================================
--- trunk/wsdlpull/win32/curl/multi.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/multi.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: multi.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: multi.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/*
This is an "external" header file. Don't give away any internals here!
Modified: trunk/wsdlpull/win32/curl/stdcheaders.h
===================================================================
--- trunk/wsdlpull/win32/curl/stdcheaders.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/stdcheaders.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: stdcheaders.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: stdcheaders.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
#include <sys/types.h>
Modified: trunk/wsdlpull/win32/curl/typecheck-gcc.h
===================================================================
--- trunk/wsdlpull/win32/curl/typecheck-gcc.h 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/win32/curl/typecheck-gcc.h 2010-07-11 19:26:33 UTC (rev 192)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: typecheck-gcc.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: typecheck-gcc.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/* wraps curl_easy_setopt() with typechecking */
Modified: trunk/wsdlpull/wsdlpull.spec
===================================================================
--- trunk/wsdlpull/wsdlpull.spec 2010-07-11 19:25:31 UTC (rev 191)
+++ trunk/wsdlpull/wsdlpull.spec 2010-07-11 19:26:33 UTC (rev 192)
@@ -4,7 +4,7 @@
# Original author: Dries Verachtert <dr...@ul...>
##
#
-%define mydocs __tmp_docdir
+%global mydocs __tmp_docdir
#
Summary: C++ Web Services client library
Name: wsdlpull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-11 19:25:38
|
Revision: 191
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=191&view=rev
Author: denis_arnaud
Date: 2010-07-11 19:25:31 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
[Release 1.23] Added man pages and updated the Id of some files to reflect latest upstream changes.
Modified Paths:
--------------
branches/wsdlpull-1.23/Makefile.am
Modified: branches/wsdlpull-1.23/Makefile.am
===================================================================
--- branches/wsdlpull-1.23/Makefile.am 2010-07-11 19:20:38 UTC (rev 190)
+++ branches/wsdlpull-1.23/Makefile.am 2010-07-11 19:25:31 UTC (rev 191)
@@ -1,36 +1,36 @@
-#***************************************************************************
-#
-# Project wsdlpull
-# Copyright (C) 2004, Vivek Krishna, <viv...@us...>
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-###########################################################################
-
-AUTOMAKE_OPTIONS = foreign
-
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
- src/config-h.in config/stamp-h.in
-
-if EXAMPLES
-SUBDIRS = src tests docs man win32 examples
-else
-SUBDIRS = src tests docs man win32
-endif
-
-docsdir = $(datadir)/wsdlpull
-docs_DATA = wsdlpull.html README
-
-EXTRA_DIST = AUTHORS COPYING CHANGES $(docs_DATA)
-
-#pkginclude_HEADERS = src/config.h
-pkgincludedir= $(includedir)
-
+#***************************************************************************
+#
+# Project wsdlpull
+# Copyright (C) 2004, Vivek Krishna, <viv...@us...>
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+###########################################################################
+
+AUTOMAKE_OPTIONS = foreign
+
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
+ src/config-h.in config/stamp-h.in
+
+if EXAMPLES
+SUBDIRS = src tests docs man win32 examples
+else
+SUBDIRS = src tests docs man win32
+endif
+
+docsdir = $(datadir)/wsdlpull
+docs_DATA = wsdlpull.html README
+
+EXTRA_DIST = AUTHORS COPYING CHANGES $(docs_DATA)
+
+#pkginclude_HEADERS = src/config.h
+pkgincludedir= $(includedir)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-11 19:20:45
|
Revision: 190
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=190&view=rev
Author: denis_arnaud
Date: 2010-07-11 19:20:38 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
[Release 1.23] Added man pages and updated the Id of some files to reflect latest upstream changes.
Modified Paths:
--------------
branches/wsdlpull-1.23/Makefile.am
branches/wsdlpull-1.23/configure.in
branches/wsdlpull-1.23/src/schemas/soap-encoding12.xsd
branches/wsdlpull-1.23/src/tools/Makefile.am
branches/wsdlpull-1.23/src/xmlpull/XmlUtils.cpp
branches/wsdlpull-1.23/tests/schema/block.xsd
branches/wsdlpull-1.23/tests/schema/choice.xsd
branches/wsdlpull-1.23/tests/schema/complexTypes.xsd
branches/wsdlpull-1.23/tests/schema/first-building-blocks.xsd
branches/wsdlpull-1.23/tests/schema/first-complex-types.xsd
branches/wsdlpull-1.23/tests/schema/first.xml
branches/wsdlpull-1.23/tests/schema/first.xsd
branches/wsdlpull-1.23/tests/schema/import.xsd
branches/wsdlpull-1.23/tests/schema/list.xsd
branches/wsdlpull-1.23/tests/schema/simpleTypes.xsd
branches/wsdlpull-1.23/win32/curl/curl.h
branches/wsdlpull-1.23/win32/curl/curlbuild.h
branches/wsdlpull-1.23/win32/curl/curlrules.h
branches/wsdlpull-1.23/win32/curl/curlver.h
branches/wsdlpull-1.23/win32/curl/easy.h
branches/wsdlpull-1.23/win32/curl/mprintf.h
branches/wsdlpull-1.23/win32/curl/multi.h
branches/wsdlpull-1.23/win32/curl/stdcheaders.h
branches/wsdlpull-1.23/win32/curl/typecheck-gcc.h
branches/wsdlpull-1.23/wsdlpull.spec
Added Paths:
-----------
branches/wsdlpull-1.23/man/
branches/wsdlpull-1.23/man/Makefile.am
branches/wsdlpull-1.23/man/wsdlpull-config.1
branches/wsdlpull-1.23/man/wsdlpull-schema.1
branches/wsdlpull-1.23/man/wsdlpull.1
Property Changed:
----------------
branches/wsdlpull-1.23/src/tools/
Modified: branches/wsdlpull-1.23/Makefile.am
===================================================================
--- branches/wsdlpull-1.23/Makefile.am 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/Makefile.am 2010-07-11 19:20:38 UTC (rev 190)
@@ -21,9 +21,9 @@
src/config-h.in config/stamp-h.in
if EXAMPLES
-SUBDIRS = src tests docs win32 examples
+SUBDIRS = src tests docs man win32 examples
else
-SUBDIRS = src tests docs win32
+SUBDIRS = src tests docs man win32
endif
docsdir = $(datadir)/wsdlpull
Modified: branches/wsdlpull-1.23/configure.in
===================================================================
--- branches/wsdlpull-1.23/configure.in 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/configure.in 2010-07-11 19:20:38 UTC (rev 190)
@@ -104,4 +104,78 @@
AM_CONDITIONAL(EXAMPLES,test "$build_examples" = yes)
-AC_OUTPUT([ Makefile docs/Makefile win32/Makefile win32/curl/Makefile win32/vs2005/Makefile win32/vs2008/Makefile src/Makefile src/xmlpull/Makefile src/schemaparser/Makefile src/wsdlparser/Makefile src/tools/Makefile examples/Makefile examples/print/Makefile examples/xml/Makefile examples/stocks/Makefile src/schemas/Makefile tests/Makefile tests/schema/Makefile tests/wsdl/Makefile])
+AC_OUTPUT([
+Makefile
+docs/Makefile
+man/Makefile
+win32/Makefile
+win32/curl/Makefile
+win32/vs2005/Makefile
+win32/vs2008/Makefile
+src/Makefile
+src/xmlpull/Makefile
+src/schemaparser/Makefile
+src/wsdlparser/Makefile
+src/tools/Makefile
+examples/Makefile
+examples/print/Makefile
+examples/xml/Makefile
+examples/stocks/Makefile
+src/schemas/Makefile
+tests/Makefile
+tests/schema/Makefile
+tests/wsdl/Makefile
+])
+
+echo "
+------------------------------------------------------------------------------
+$PACKAGE-$VERSION library configuration:
+------------------------------------------------------------------------------
+
+Directories:
+ - prefix ............ : ${prefix}
+ - exec_prefix ....... : ${exec_prefix}
+ - includedir ........ : ${includedir}
+ - libdir ............ : ${libdir}
+ - docdir ............ : ${docdir}
+ - mandir ............ : ${mandir}
+ - infodir ........... : ${infodir}
+
+Switches:
+ - exceptions ........ : ${enable_exceptions}
+ - use-nls ........... : ${USE_NLS}
+ - info-doc .......... : ${enable_info_doc}
+ - html-doc .......... : ${enable_html_doc}
+ - shared ............ : ${enable_shared}
+ - static ............ : ${enable_static}
+
+Documentation tools:
+ - texinfo ........... : ${texinfo_ok}
+ - doxygen ........... : ${doxygen_ok}
+ - latex ............. : ${latex_ok}
+ - dvips ............. : ${dvips_ok}
+ - ghostscript ....... : ${gs_ok}
+
+Testing tools:
+ - diff .............. : ${diff_ok}
+ - sed ............... : ${sed_ok}
+
+Compiler/linker flags/libs/defs:
+ - CXX ............... : ${CXX}
+ - CFLAGS ............ : ${CFLAGS}
+ - CXXFLAGS .......... : ${CXXFLAGS}
+ - CPPFLAGS .......... : ${CPPFLAGS}
+ - FFLAGS ............ : ${FFLAGS}
+ - LDFLAGS ........... : ${LDFLAGS}
+ - LIBS .............. : ${LIBS}
+
+External libraries:
+ - CPPUNIT ........... :
+ o CPPUNIT_VERSION . : ${CPPUNIT_VERSION}
+ o CPPUNIT_CFLAGS .. : ${CPPUNIT_CFLAGS}
+ o CPPUNIT_LIBS .... : ${CPPUNIT_LIBS}
+
+------------------------------------------------------------------------------
+Now type 'make && make install' to build and install $PACKAGE-$VERSION library
+------------------------------------------------------------------------------
+"
Property changes on: branches/wsdlpull-1.23/man
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Added: branches/wsdlpull-1.23/man/Makefile.am
===================================================================
--- branches/wsdlpull-1.23/man/Makefile.am (rev 0)
+++ branches/wsdlpull-1.23/man/Makefile.am 2010-07-11 19:20:38 UTC (rev 190)
@@ -0,0 +1,4 @@
+# Man pages
+man_MANS = wsdlpull.1 wsdlpull-schema.1 wsdlpull-config.1
+
+EXTRA_DIST = $(man_MANS)
Added: branches/wsdlpull-1.23/man/wsdlpull-config.1
===================================================================
--- branches/wsdlpull-1.23/man/wsdlpull-config.1 (rev 0)
+++ branches/wsdlpull-1.23/man/wsdlpull-config.1 2010-07-11 19:20:38 UTC (rev 190)
@@ -0,0 +1,37 @@
+.TH WSDLPull 1 "11 July 2010"
+.SH NAME
+wsdlpull-config - script to get version number and compiler flags of the installed WSDLPull library
+.SH SYNOPSIS
+.B wsdlpull-config
+[\-\-prefix] [\-\-version] [\-\-libs] [\-\-cflags]
+.SH DESCRIPTION
+.PP
+\fIwsdlpull-config\fP is a tool that is used by configure to determine
+the compiler and linker flags that should be used to compile
+and link programs that use \fIWSDLPull\fP. It is also used internally
+by the GNU autoconf .m4 macros that are included with \fIWSDLPull\fP.
+.
+.SH OPTIONS
+\fIwsdlpull-config\fP accepts the following options:
+.TP 8
+.B \-\-version
+Print the currently installed version of \fIWSDLPull\fP on the standard output.
+.TP 8
+.B \-\-libs
+Print the linker flags that are necessary to link a \fIWSDLPull\fP program
+.TP 8
+.B \-\-cflags
+Print the compiler flags that are necessary to compile a \fIWSDLPull\fP program.
+.TP 8
+.B \-\-prefix
+Show the WSDLPull installation prefix.
+.SH SEE ALSO
+.BR curl (1),
+.SH COPYRIGHT
+Copyright \(co 2010 Vivek Krishna
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
Added: branches/wsdlpull-1.23/man/wsdlpull-schema.1
===================================================================
--- branches/wsdlpull-1.23/man/wsdlpull-schema.1 (rev 0)
+++ branches/wsdlpull-1.23/man/wsdlpull-schema.1 2010-07-11 19:20:38 UTC (rev 190)
@@ -0,0 +1,20 @@
+.TH Wsdlpull-Schema 1 "Web Services Schema Parser" "Wsdlpull Team" \" -*- nroff -*-
+.SH NAME
+wsdlpull-schema - C++ Web Services Schema Parser
+.SH SYNOPSIS
+#include <schemaparser/...>
+.SH DESCRIPTION
+WSDLPull includes a schema parser. That schema parser can be used in
+isolation to parse XSD schemas. The schema parser can validate an
+instance document of the XSD schema just parsed.
+.PP
+The library covers the following areas,
+.TP
+.nf
+.BR
+WSDL (Web Services Description Language)
+XSD Schema
+.fi
+.PP
+Please report any bugs to
+.B https://sourceforge.net/tracker/?group_id=96736&atid=615728
Added: branches/wsdlpull-1.23/man/wsdlpull.1
===================================================================
--- branches/wsdlpull-1.23/man/wsdlpull.1 (rev 0)
+++ branches/wsdlpull-1.23/man/wsdlpull.1 2010-07-11 19:20:38 UTC (rev 190)
@@ -0,0 +1,23 @@
+.TH WSDLPull 1 "C++ Web Services Client Library" "WSDLPull Team" \" -*- nroff -*-
+.SH NAME
+wsdlpull - C++ Web Services Library
+.SH SYNOPSIS
+#include <wsdlpull/...>
+.SH DESCRIPTION
+wsdlpull is a C++ web services client library. It includes a WSDL
+Parser, a XML Schema parser and validator and an XML Parser and
+serializer. It has an API and command line tool for dynamic WSDL
+inspection and invocation. The command line tool is a generic web
+service client using which you can invoke most web services from
+command line without writing any code.
+.PP
+The library covers the following areas,
+.TP
+.nf
+.BR
+WSDL (Web Services Description Language)
+XSD Schema
+.fi
+.PP
+Please report any bugs to
+.B https://sourceforge.net/tracker/?group_id=96736&atid=615728
Modified: branches/wsdlpull-1.23/src/schemas/soap-encoding12.xsd
===================================================================
--- branches/wsdlpull-1.23/src/schemas/soap-encoding12.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/src/schemas/soap-encoding12.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,7 +1,7 @@
<!-- Schema defined in the SOAP Version 1.2 Part 2 specification
Recommendation at
http://www.w3.org/TR/2003/REC-soap12-part2-20030624/
- $Id: soap-encoding12.xsd,v 1.1 2008-11-01 20:08:41 vivek200120 Exp $
+ $Id: soap-encoding12.xsd,v 1.1 2008/11/01 20:08:41 vivek200120 Exp $
Copyright (C)2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
W3C viability, trademark, document use and software licensing rules
Property changes on: branches/wsdlpull-1.23/src/tools
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile
Makefile.in
schema
wsdl
+ .deps
.libs
Makefile
Makefile.in
wsdlpull
wsdlpull-schema
Modified: branches/wsdlpull-1.23/src/tools/Makefile.am
===================================================================
--- branches/wsdlpull-1.23/src/tools/Makefile.am 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/src/tools/Makefile.am 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,27 +1,27 @@
-## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-
-MAINTAINERCLEANFILES = Makefile.in
-
-# src/xmlpull
-include $(srcdir)/sources.mk
-
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
-CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
-
-## WSDL Invocation stuff
-bin_PROGRAMS = wsdl schema
-
-## Dynamic Web service invocation
-wsdl_SOURCES = $(wsdltool_cc_sources)
-wsdl_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la \
- $(top_builddir)/src/wsdlparser/libwsdl.la
-
-## Schema validation tool
-schema_SOURCES = $(schematool_cc_sources)
-schema_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la
-
+## This is the input file for automake, which will generate Makefile.in ##
+## not a GNU package. You can remove this line, if
+## you have all needed files, that a GNU package needs
+AUTOMAKE_OPTIONS = foreign
+
+MAINTAINERCLEANFILES = Makefile.in
+
+# src/xmlpull
+include $(srcdir)/sources.mk
+
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
+CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
+
+## WSDL Invocation stuff
+bin_PROGRAMS = wsdlpull wsdlpull-schema
+
+## Dynamic Web service invocation
+wsdlpull_SOURCES = $(wsdltool_cc_sources)
+wsdlpull_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
+ $(top_builddir)/src/schemaparser/libschema.la \
+ $(top_builddir)/src/wsdlparser/libwsdl.la
+
+## Schema validation tool
+wsdlpull_schema_SOURCES = $(schematool_cc_sources)
+wsdlpull_schema_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
+ $(top_builddir)/src/schemaparser/libschema.la
+
Modified: branches/wsdlpull-1.23/src/xmlpull/XmlUtils.cpp
===================================================================
--- branches/wsdlpull-1.23/src/xmlpull/XmlUtils.cpp 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/src/xmlpull/XmlUtils.cpp 2010-07-11 19:20:38 UTC (rev 190)
@@ -148,25 +148,22 @@
urlCache_[uri]=filename;
#ifdef WITH_CURL
- CURL * curl = NULL;
+ CURL * curl;
CURLcode res;
curl=curl_easy_init();
- FILE * file = NULL;
+ FILE * file;
if(curl){
file=fopen(filename.c_str(),"w");
if (file == NULL) {
fprintf(stderr, "Can't open file %s: %s\n", filename.c_str(),
strerror(errno));
- // TODO: an exception should maybe thrown, to replace the exit(-1),
- // instead of the simple 'return false'
- // exit(-1);
- return false;
+ exit(-1);
}
- curl_easy_setopt(curl, CURLOPT_URL, uri.c_str());
- curl_easy_setopt(curl, CURLOPT_FILE, (void*)file);
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60);
+ curl_easy_setopt(curl, CURLOPT_URL,uri.c_str());
+ curl_easy_setopt(curl,CURLOPT_FILE,(void*)file);
+ curl_easy_setopt(curl,CURLOPT_TIMEOUT,60);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
Modified: branches/wsdlpull-1.23/tests/schema/block.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/block.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/block.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/block.xsd,v 1.1 2008-05-03 11:13:33 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/block.xsd,v 1.1 2008/05/03 11:13:33 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="name" type="xs:token"/>
Modified: branches/wsdlpull-1.23/tests/schema/choice.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/choice.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/choice.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/choice.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/choice.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="string255">
Modified: branches/wsdlpull-1.23/tests/schema/complexTypes.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/complexTypes.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/complexTypes.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/complexTypes.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/complexTypes.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
Modified: branches/wsdlpull-1.23/tests/schema/first-building-blocks.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/first-building-blocks.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/first-building-blocks.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/first-building-blocks.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/first-building-blocks.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="simpleTypes.xsd"/>
Modified: branches/wsdlpull-1.23/tests/schema/first-complex-types.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/first-complex-types.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/first-complex-types.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/first-complex-types.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/first-complex-types.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<!-- Copyright O'Reilly -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
Modified: branches/wsdlpull-1.23/tests/schema/first.xml
===================================================================
--- branches/wsdlpull-1.23/tests/schema/first.xml 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/first.xml 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/first.xml,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/first.xml,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<!-- Copyright O'Reilly -->
<library>
<book id="b0836217462" available="true">
Modified: branches/wsdlpull-1.23/tests/schema/first.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/first.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/first.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/first.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/first.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="simpleTypes.xsd"/>
Modified: branches/wsdlpull-1.23/tests/schema/import.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/import.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/import.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/import.xsd,v 1.1 2008-06-15 17:35:23 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/import.xsd,v 1.1 2008/06/15 17:35:23 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://wsdlpull/import" xmlns:imp1="http://wsdlpull/import1" tns="http://wsdlpull/import">
<xs:import namespace="http://wsdlpull/import1" schemaLocation="import1.xsd"/>
Modified: branches/wsdlpull-1.23/tests/schema/list.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/list.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/list.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/list.xsd,v 1.1 2008-05-03 11:13:35 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/list.xsd,v 1.1 2008/05/03 11:13:35 vivek200120 Exp $ -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:simpleType name="USState">
<xsd:restriction base="xsd:string">
Modified: branches/wsdlpull-1.23/tests/schema/simpleTypes.xsd
===================================================================
--- branches/wsdlpull-1.23/tests/schema/simpleTypes.xsd 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/tests/schema/simpleTypes.xsd 2010-07-11 19:20:38 UTC (rev 190)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /home/www/svn/archives/sourceforge/wsdlpull-cvsroot/wsdlpull/tests/schema/simpleTypes.xsd,v 1.2 2008-12-11 04:18:07 vivek200120 Exp $ -->
+<!-- $Header: /cvsroot/wsdlpull/wsdlpull/tests/schema/simpleTypes.xsd,v 1.2 2008/12/11 04:18:07 vivek200120 Exp $ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="string255">
Modified: branches/wsdlpull-1.23/win32/curl/curl.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/curl.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/curl.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: curl.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: curl.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/*
Modified: branches/wsdlpull-1.23/win32/curl/curlbuild.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/curlbuild.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/curlbuild.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: curlbuild.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: curlbuild.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/* ================================================================ */
Modified: branches/wsdlpull-1.23/win32/curl/curlrules.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/curlrules.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/curlrules.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: curlrules.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: curlrules.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/* ================================================================ */
Modified: branches/wsdlpull-1.23/win32/curl/curlver.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/curlver.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/curlver.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: curlver.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: curlver.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/* This header file contains nothing but libcurl version info, generated by
Modified: branches/wsdlpull-1.23/win32/curl/easy.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/easy.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/easy.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: easy.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: easy.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
#ifdef __cplusplus
extern "C" {
Modified: branches/wsdlpull-1.23/win32/curl/mprintf.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/mprintf.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/mprintf.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: mprintf.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: mprintf.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
#include <stdarg.h>
Modified: branches/wsdlpull-1.23/win32/curl/multi.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/multi.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/multi.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: multi.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: multi.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/*
This is an "external" header file. Don't give away any internals here!
Modified: branches/wsdlpull-1.23/win32/curl/stdcheaders.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/stdcheaders.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/stdcheaders.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: stdcheaders.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: stdcheaders.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
#include <sys/types.h>
Modified: branches/wsdlpull-1.23/win32/curl/typecheck-gcc.h
===================================================================
--- branches/wsdlpull-1.23/win32/curl/typecheck-gcc.h 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/win32/curl/typecheck-gcc.h 2010-07-11 19:20:38 UTC (rev 190)
@@ -20,7 +20,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id: typecheck-gcc.h,v 1.1 2008-10-24 02:48:14 vivek200120 Exp $
+ * $Id: typecheck-gcc.h,v 1.1 2008/10/24 02:48:14 vivek200120 Exp $
***************************************************************************/
/* wraps curl_easy_setopt() with typechecking */
Modified: branches/wsdlpull-1.23/wsdlpull.spec
===================================================================
--- branches/wsdlpull-1.23/wsdlpull.spec 2010-06-12 12:12:11 UTC (rev 189)
+++ branches/wsdlpull-1.23/wsdlpull.spec 2010-07-11 19:20:38 UTC (rev 190)
@@ -4,30 +4,31 @@
# Original author: Dries Verachtert <dr...@ul...>
##
#
-%define mydocs __tmp_docdir
+%global mydocs __tmp_docdir
#
Summary: C++ Web Services client library
Name: wsdlpull
Version: 1.23
-Release: 1%{?dist}
-License: LGPLv2
+Release: 2%{?dist}
+License: LGPLv2 and OReilly and MIT
Group: System Environment/Libraries
URL: http://%{name}.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# That patch will be submitted upstream
-Patch0: wsdlpull-%{version}-1-fix-gcc43-compatibility.patch
+Patch0: wsdlpull-%{version}-%{release}-fix-gcc43-compatibility.patch
# That patch will be submitted upstream
-Patch1: wsdlpull-%{version}-1-fix-gnu-autotools-compatibility.patch
-#BuildRequires:
+Patch1: wsdlpull-%{version}-%{release}-fix-gnu-autotools-compatibility.patch
+# Some documentation files are still DOS-formatted
+BuildRequires: dos2unix
%description
-wsdlpull is a C++ web services client library. It includes a WSDL
+%{name} is a C++ web services client library. It includes a WSDL
Parser, a XSD Schema Parser and Validator and XML Parser and serializer
and an API and command line tool for dynamic WSDL inspection and
invocation.
-wsdlpull comes with a generic web service client.Using wsdlpull's /wsdl/
+%{name} comes with a generic web service client. Using %{name}'s /wsdl/
tool you can invoke most web services from command line without writing
any code.
@@ -46,15 +47,8 @@
Group: Documentation
%if 0%{?fedora} >= 10
BuildArch: noarch
-BuildRequires: texlive-latex
%endif
-%if 0%{?fedora} < 10
-BuildRequires: tetex-latex
-%endif
-%{?el5:BuildRequires: tetex-latex}
BuildRequires: doxygen
-#BuildRequires: graphviz
-#BuildRequires: ghostscript
%description doc
This package contains the documentation in the HTML format of the %{name}
@@ -67,51 +61,48 @@
%patch0 -p1
# Remove any CVS sub-directory (they should not be delivered with the tar-ball)
-find . -name 'CVS' -print | xargs rm -rf
+find . -name 'CVS' -print | xargs %{__rm} -rf
# Remove any a.out binary (they should not be delivered with the tar-ball)
-find . -name 'a.out' -print | xargs rm -f
+find . -name 'a.out' -print | xargs %{__rm} -f
# Remove the generated HTML documentation (it should not be delivered
# with the tar-ball, as it is generated)
if [ -d docs/html ]; then
- rm -rf docs/html
+ %{__rm} -rf docs/html
fi
# Adapt a little bit the structure, so as to be more compliant with
# GNU Autotools
-mkdir config
-mv config.guess config.sub depcomp install-sh ltmain.sh missing config
-mv config.h.in src
+%{__mkdir} config
+%{__mv} config.guess config.sub depcomp install-sh ltmain.sh missing config
+%{__mv} config.h.in src
# Rename the standard documentation files
-mv AUTHORS.txt AUTHORS
-mv CHANGES.txt CHANGES
-mv COPYING.txt COPYING
-mv README.txt README
+%{__mv} AUTHORS.txt AUTHORS
+dos2unix AUTHORS
+%{__mv} CHANGES.txt CHANGES
+%{__mv} COPYING.txt COPYING
+%{__mv} README.txt README
# Apply the GNU Autotools compatibility patch
%patch1 -p1
%build
%configure --disable-static
-make %{?_smp_mflags}
+make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-#%%find_lang %{name}
-# remove unpackaged files from the buildroot
-#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
-#rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
-rm -rf %{mydocs} && mkdir -p %{mydocs}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
+# Remove unpackaged files from the buildroot
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{mydocs} && %{__mkdir_p} %{mydocs}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
@@ -124,7 +115,8 @@
%{_bindir}/schema
%{_bindir}/wsdl
%{_libdir}/lib*.so.*
-%{_datadir}/%{name}
+%{_mandir}/man1/%{name}.1.*
+%dir %{_datadir}/%{name}
%files devel
%defattr(-,root,root,-)
@@ -136,10 +128,15 @@
%files doc
%defattr(-,root,root,-)
-%doc %{mydocs}/html
%doc AUTHORS CHANGES COPYING README
+%doc %{mydocs}/html
%changelog
+* Tue Jul 11 2010 Denis Arnaud <den...@m4...> 1.23-2
+- Integrated Patrick Monnerat's remarks
+ (https://bugzilla.redhat.com/show_bug.cgi?id=502686#c6)
+
* Tue Jun 26 2009 Denis Arnaud <den...@m4...> 1.23-1
- Initial package, thanks to Dries Verachtert <dr...@ul...>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-06-12 12:15:05
|
Revision: 189
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=189&view=rev
Author: denis_arnaud
Date: 2010-06-12 12:12:11 +0000 (Sat, 12 Jun 2010)
Log Message:
-----------
[Upstream] Upstream integration (version 1.24).
Modified Paths:
--------------
trunk/wsdlpull/AUTHORS
trunk/wsdlpull/CHANGES
trunk/wsdlpull/src/schemaparser/SchemaParser.cpp
trunk/wsdlpull/src/schemaparser/SchemaValidator.cpp
trunk/wsdlpull/src/tools/wsdl.cpp
trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp
trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp
trunk/wsdlpull/src/xmlpull/XmlUtils.cpp
trunk/wsdlpull/src/xmlpull/XmlUtils.h
Modified: trunk/wsdlpull/AUTHORS
===================================================================
--- trunk/wsdlpull/AUTHORS 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/AUTHORS 2010-06-12 12:12:11 UTC (rev 189)
@@ -2,8 +2,10 @@
1. Vivek Krishna <viv...@us...>
Other contributors
+Daniel Rodriguez (for the xpath implementation)
+Meindert Oldenburger (for making wsdlpull more thread safe)
Scott Chun (Windows DLL export)
Philip Helger (Windows makefile)
Thomas Steinel
-Stefan Fleiter
+Stefan Fleiter
Igor Polyakov
Modified: trunk/wsdlpull/CHANGES
===================================================================
--- trunk/wsdlpull/CHANGES 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/CHANGES 2010-06-12 12:12:11 UTC (rev 189)
@@ -1,3 +1,10 @@
+1.24
+Generate single empty tag for nillable complex elements i.e <name/> instead of <name><fname/><lname/></name>
+Pass the correct schema parser when types are imported
+Options to parse schemas from the web/filesystem
+Thread safety fixes while fetching temp files
+Updated AUTHORS.txt file
+
1.23
Fixed the getAsXpath method
Changed the SOAP 1.2 uri in Soap.cpp to point to correct schema
Modified: trunk/wsdlpull/src/schemaparser/SchemaParser.cpp
===================================================================
--- trunk/wsdlpull/src/schemaparser/SchemaParser.cpp 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/src/schemaparser/SchemaParser.cpp 2010-06-12 12:12:11 UTC (rev 189)
@@ -1524,10 +1524,11 @@
return parseInclude();//sometimes import is used to import schemas in same ns.
//treat it internally like include
+
// if (loc.empty())
// loc = ns; //try using the namespace as schemalocation
- // FV Sat Dec 22 15:33:09 CET 2007 I added the absolute path and the file:/ use-cases in the the test
+
// if ( !loc.empty() && loc.find("http://") == std::string::npos)
// loc = uri_ + loc;
@@ -1566,6 +1567,8 @@
}
}
+
+
if(sp->parseSchemaTag())
addImport(sp);
else
Modified: trunk/wsdlpull/src/schemaparser/SchemaValidator.cpp
===================================================================
--- trunk/wsdlpull/src/schemaparser/SchemaValidator.cpp 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/src/schemaparser/SchemaValidator.cpp 2010-06-12 12:12:11 UTC (rev 189)
@@ -232,7 +232,7 @@
ContentModel* cm=ct->getContents();
ContentModel * bCm = 0;
if (bt)
- bCm = bt ->getContents();
+ bCm = bt->getContents();
if(cm)
validateContentModel(xpp,
cm,
@@ -296,7 +296,8 @@
int t = btCnt->getTypeId();
const ComplexType* ct = static_cast<const ComplexType*>(btCnt->schemaParser()->getType(t));
bCm = ct->getContents();
- bci =bCm->begin();
+ if (bCm)
+ bci =bCm->begin();
}
switch (cm->getCompositor()) {
Modified: trunk/wsdlpull/src/tools/wsdl.cpp
===================================================================
--- trunk/wsdlpull/src/tools/wsdl.cpp 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/src/tools/wsdl.cpp 2010-06-12 12:12:11 UTC (rev 189)
@@ -48,6 +48,8 @@
std::cout<<" -t requesttimeout in seconds"<<std::endl;
std::cout<<" -e set SOAP headers in input"<<std::endl;
std::cout<<" -g generate sample SOAP message for the invocation"<<std::endl;
+ std::cout<<" -w get soap,encoding and wsdl schemas from the web"<<std::endl;
+ std::cout<<" -f get soap,encoding and wsdl schemas from the filesystem"<<std::endl;
std::cout<<" -r Validate the response message with schema even when xpath selector is used(default is off)"<<std::endl;
std::cout<<"With no arguments,wsdl starts in the interactive mode accepting operation name and parameters from the standard input."<<std::endl<<std::endl;
std::cout<<"An xpath expression can be used to extract elements from web service response.If the expression points to an element or an attribute,the element's text or attribute value will be returned.The expression will match all occurrences in the xml tree"<<std::endl;
@@ -116,7 +118,6 @@
WsdlPull::WsdlParser::useLocalSchema_ = false;
#endif
-
int i =1;
for (;i<argc && !brkloop;){
switch(argv[i][0]){
@@ -207,6 +208,14 @@
else if(opt == "r"){
processResponse = true;
}
+ else if (opt == "w"){
+
+ WsdlPull::WsdlParser::useLocalSchema_ = false;
+ }
+ else if (opt == "f"){
+
+ WsdlPull::WsdlParser::useLocalSchema_ = true;
+ }
else{
std::cerr<<"Unknown option "<<argv[i]<<std::endl;
usage();
Modified: trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp
===================================================================
--- trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp 2010-06-12 12:12:11 UTC (rev 189)
@@ -447,6 +447,10 @@
if (prt == Part::Elem){
const Element * e = p->element();
+ if (e->getTypeNamespace() != sParser->getNamespace()) {
+ sParser = wParser_->getSchemaParser(e->getTypeNamespace());
+ }
+ //the above can happen when the actual type/element is defined in someother namespace via imports
serializeType((Schema::Type)e->getType(),e->getName(),sParser,1,1,parents,e->getTypeNamespace(),true);
}
else{
@@ -1667,9 +1671,9 @@
#elif _WIN32
- char* sResults = 0;
+ char* sResults = (char*)0;
XmlUtils::winPost(location_,username,passwd,postData,action_,sResults);
- strResults_ = std::string(sResults);
+ strResults_ = (sResults != (char*)0) ? std::string(sResults) : "";
#endif
if(verbose_ && !strResults_.empty()){
Modified: trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp
===================================================================
--- trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp 2010-06-12 12:12:11 UTC (rev 189)
@@ -164,18 +164,8 @@
xmlStream.close();
// delete all the temp files
- oslink::directory dir(".");
- while (dir) {
- std::string fname = dir.next();
- if (fname.find(".wp-tmp") != std::string::npos)
- {
-#ifdef WIN32
- ::DeleteFile(fname.c_str());
-#else
- unlink(fname.c_str());
-#endif
- }
- }
+ XmlUtils::delUriFiles();
+
}
const Binding *
Modified: trunk/wsdlpull/src/xmlpull/XmlUtils.cpp
===================================================================
--- trunk/wsdlpull/src/xmlpull/XmlUtils.cpp 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/src/xmlpull/XmlUtils.cpp 2010-06-12 12:12:11 UTC (rev 189)
@@ -35,6 +35,8 @@
#include <termios.h>
#include <unistd.h>
#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
#endif
#ifdef WITH_CURL
@@ -45,12 +47,23 @@
#include <cstdlib>
#include <cstring>
#include <fstream>
+#include <sstream>
#include <map>
+#include <list>
+
#include "xmlpull/XmlUtils.h"
-const std::string ALPHA = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-std::map<std::string,std::string> urlCache_;
+// Global variables
+#ifdef _WIN32
+CRITICAL_SECTION cs;
+#else
+static pthread_mutex_t url_mutex;
+#endif
+// key is uri+ProcId+ThreadId
+// elem is string with the uri
+std::map<std::string, std::string> urlCache_;
+
//put all I/O and std::string manip utiliy functions here
int
@@ -99,74 +112,234 @@
return str << std::endl << "*************" << std::endl;
}
+
+// get file name
+std::string
+XmlUtils::getFileName(std::string uri)
+{
+ std::string filename;
+
+ // unique key url + suffix, see also XmlUtils::creUriFile
+ std::string map_key(uri + XmlUtils::getSuffix());
+
+ // Lock actions on urlCache
+ XmlUtils::MutexLock();
+
+ if (urlCache_.find(map_key) != urlCache_.end()) {
+ filename = urlCache_[map_key];
+ }
+ else {
+ filename = "";
+ }
+
+ // Unlock actions on urlCache
+ XmlUtils::MutexUnlock();
+
+ return filename;
+}
+
+
+// Create unique file
+std::string
+XmlUtils::creUriFile(std::string uri)
+{
+ // unique key url + suffix, see also XmlUtils::getFileName
+ std::string map_key(uri + XmlUtils::getSuffix());
+
+#ifdef _WIN32
+ char uniqueFile[MAX_PATH];
+ GetTempFileName(".", "uri", 0, (LPSTR)uniqueFile);
+#else
+ char uniqueFile[PATH_MAX];
+ char ufile[] = "/tmp/wsdl_uri_XXXXXX";
+ int fd = mkstemp(ufile);
+ close(fd);
+ strcpy(uniqueFile, ufile);
+#endif
+
+ // Lock actions on urlCache
+ XmlUtils::MutexLock();
+
+ urlCache_[map_key] = uniqueFile;
+
+ // Unlock actions on urlCache
+ XmlUtils::MutexUnlock();
+
+ return uniqueFile;
+}
+
+
+// Only files belonging to current proces and thread are deleted
+void
+XmlUtils::delUriFiles()
+{
+ std::map<std::string, std::string>::iterator iter;
+ std::list<std::string> uris;
+
+ // Lock actions on urlCache
+ XmlUtils::MutexLock();
+
+ for (iter = urlCache_.begin(); iter != urlCache_.end(); iter++) {
+ if ((iter->first).find(XmlUtils::getSuffix()) != std::string::npos) {
+#ifdef _WIN32
+ ::DeleteFile((LPCSTR)iter->second.c_str());
+#else
+ unlink(iter->second.c_str());
+#endif
+ // remember the key to delete the items in the map
+ uris.push_back(iter->first);
+ }
+ }
+
+ // delete items in the map
+ while (!uris.empty()) {
+ iter = urlCache_.find(uris.front());
+ urlCache_.erase(iter);
+ uris.pop_front();
+ }
+
+ // Unlock actions on urlCache
+ XmlUtils::MutexUnlock();
+
+}
+
+
+// File name suffix is constructed of ProcessId and ThreadId
+std::string
+XmlUtils::getSuffix()
+{
+ std::stringstream ssuffix;
+#ifdef _WIN32
+ ssuffix << GetCurrentProcessId() << "_" << GetCurrentThreadId();
+#else
+ ssuffix << getpid() << "_" << pthread_self();
+#endif
+
+ return ssuffix.str();
+}
+
+void
+uri_init()
+{
+ /* initialise mutex for map operations */
+#ifdef _WIN32
+ InitializeCriticalSection(&cs);
+#else
+ pthread_mutex_init(&url_mutex, NULL);
+#endif
+}
+
+
+void
+XmlUtils::MutexInit()
+{
+#ifdef _WIN32
+ static volatile int initialized = 0;
+ static HANDLE mtx;
+
+ if (!initialized) {
+ if (!mtx) {
+ HANDLE mymtx;
+ mymtx = CreateMutex(NULL, 0, NULL);
+ if (InterlockedCompareExchangePointer(&mtx, mymtx, NULL) != NULL)
+ CloseHandle(mymtx);
+ }
+
+ WaitForSingleObject(mtx, 0);
+ if (!initialized) {
+ uri_init();
+ initialized = 1;
+ }
+ ReleaseMutex(mtx);
+ }
+#else
+ static pthread_once_t url_once = PTHREAD_ONCE_INIT;
+ pthread_once(&url_once, uri_init);
+#endif
+}
+
+
+void
+XmlUtils::MutexLock()
+{
+#ifdef _WIN32
+ // Request ownership of the critical section.
+ EnterCriticalSection(&cs);
+#else
+ // mutex_start
+ pthread_mutex_lock(&url_mutex);
+#endif
+}
+
+
+void
+XmlUtils::MutexUnlock()
+{
+#ifdef _WIN32
+ // Release ownership of the critical section.
+ LeaveCriticalSection(&cs);
+#else
+ // mutex_end
+ pthread_mutex_unlock(&url_mutex);
+#endif
+}
+
+
/*
-* Fetch a document at the given URI and store it in a file
-*/
-
+ * Fetch a document at the given URI and store it in a file
+ */
bool
WSDLPULL_EXPORT
XmlUtils::fetchUri(std::string uri,
std::string& filename)
{
- if(uri.find("http://")!=std::string::npos ||
- uri.find("https://")!=std::string::npos ||
- uri.find("ftp://") !=std::string::npos)
- {
-
- if (urlCache_.find(uri) != urlCache_.end()) {
- filename=urlCache_[uri];
- std::ifstream tfs;
- tfs.open(filename.c_str());
- if (tfs.fail()) {
- urlCache_.erase(uri);
- }else {
-
- return true;
- }
+ if (uri.find("http://") != std::string::npos ||
+ uri.find("https://") != std::string::npos ||
+ uri.find("ftp://") != std::string::npos) {
+
+ // mutex init for url map operations
+ XmlUtils::MutexInit();
+
+ // initial status is that file does not excist
+ bool file_cached = false;
+
+ // verify if the file already cached and fysical exists
+ filename = XmlUtils::getFileName(uri);
+ if (!filename.empty()) {
+ std::ifstream tfs;
+ tfs.open(filename.c_str());
+ file_cached = !tfs.fail();
+ tfs.close();
}
-#ifndef _WIN32
- filename=uri.substr(uri.rfind('/')+1);
- if (filename.empty()) {
- //for *nix try to use the name from the url
-#endif
- // Generate a random "[8 chars].[3 chars]" filename
- srand(time(NULL));
- filename.clear();
- for (int i = 0; i < 8; i++){
-
- filename += ALPHA.at(rand()%52);
+ // if not cached create new file and cach it
+ if (!file_cached) {
+ filename = XmlUtils::creUriFile(uri);
}
- filename.append(".wp-tmp");
-#ifndef _WIN32
+ // return if the file is already cached
+ else {
+ return true;
}
- std::string dir="/tmp/";
- filename = dir + filename;
-#endif
- urlCache_[uri]=filename;
#ifdef WITH_CURL
- CURL * curl = NULL;
+ CURL * curl;
CURLcode res;
curl=curl_easy_init();
- FILE * file = NULL;
+ FILE * file;
if(curl){
file=fopen(filename.c_str(),"w");
if (file == NULL) {
fprintf(stderr, "Can't open file %s: %s\n", filename.c_str(),
strerror(errno));
- // TODO: an exception should maybe thrown, to replace the exit(-1),
- // instead of the simple 'return false'
- // exit(-1);
- return false;
+ exit(-1);
}
- curl_easy_setopt(curl, CURLOPT_URL, uri.c_str());
- curl_easy_setopt(curl, CURLOPT_FILE, (void*)file);
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60);
+ curl_easy_setopt(curl, CURLOPT_URL,uri.c_str());
+ curl_easy_setopt(curl,CURLOPT_FILE,(void*)file);
+ curl_easy_setopt(curl,CURLOPT_TIMEOUT,60);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
@@ -217,6 +390,7 @@
// - use-case with a single '/' added (I am not sure this is conform to spec)
// #ifdef _WIN32
#if !defined(_WIN32)
+ /*
unsigned int p;
if ((p=uri.find("file:///"))!=std::string::npos)
{
@@ -230,6 +404,13 @@
{
uri = uri.substr(p+5, uri.length()-p-5);
}
+ */
+ std::string::size_type p;
+ p = uri.find("file:");
+ if ( p !=std::string::npos)
+ {
+ uri = uri.substr(5);
+ }
#endif
filename=uri;
Modified: trunk/wsdlpull/src/xmlpull/XmlUtils.h
===================================================================
--- trunk/wsdlpull/src/xmlpull/XmlUtils.h 2009-06-22 20:08:41 UTC (rev 188)
+++ trunk/wsdlpull/src/xmlpull/XmlUtils.h 2010-06-12 12:12:11 UTC (rev 189)
@@ -32,6 +32,13 @@
//put all miscellaneous utiliy functions here
namespace XmlUtils {
+ std::string getSuffix();
+ std::string getFileName(std::string);
+ std::string creUriFile(std::string);
+ void delUriFiles();
+ void MutexInit();
+ void MutexLock();
+ void MutexUnlock();
int parseInt (std::string s, int radix = 10);
std::ostream & dbsp (std::ostream & str);
std::ostream & blk (std::ostream & str);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-06-22 20:08:42
|
Revision: 188
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=188&view=rev
Author: denis_arnaud
Date: 2009-06-22 20:08:41 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
Integrated upstream patches.
Modified Paths:
--------------
trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp
trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp
Modified: trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp
===================================================================
--- trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp 2009-06-06 21:55:53 UTC (rev 187)
+++ trunk/wsdlpull/src/wsdlparser/WsdlInvoker.cpp 2009-06-22 20:08:41 UTC (rev 188)
@@ -447,7 +447,7 @@
if (prt == Part::Elem){
const Element * e = p->element();
- serializeType((Schema::Type)e->getType(),e->getName(),sParser,1,1,parents,nsp,true);
+ serializeType((Schema::Type)e->getType(),e->getName(),sParser,1,1,parents,e->getTypeNamespace(),true);
}
else{
Modified: trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp
===================================================================
--- trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp 2009-06-06 21:55:53 UTC (rev 187)
+++ trunk/wsdlpull/src/wsdlparser/WsdlParser.cpp 2009-06-22 20:08:41 UTC (rev 188)
@@ -1496,12 +1496,20 @@
//check for definitions
- if ((isType && schemaParser_[i]->getType(name,false) != 0) ||
+ if ((isType && schemaParser_[i]->getType(name,false) != 0) ||
(!isType && schemaParser_[i]->getElement(name,false) != 0))
return i;
}
+ else if (schemaParser_[i]->isImported(type.getNamespace())) {
+
+
+ if ((isType && schemaParser_[i]->getType(name) != 0) ||
+ (!isType && schemaParser_[i]->getElement(name) != 0))
+
+ return i;
+ }
}
return -1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
