[Extras-wsdlpull-svn] SF.net SVN: extras-wsdlpull:[200] trunk/wsdlpull

[<den...@us...>]

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.