ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Bug fix

Browse source
This commit is contained in:
Ziver Koc 2009-09-18 11:34:16 +00:00
parent 19a0e92d88
commit b3ad292ff9
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/zutil/network/UpdateServer.java
View file

@ -11,6 +11,7 @@ import java.net.Socket;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import zutil.FileFinder; import zutil.FileFinder;
import zutil.Hasher; import zutil.Hasher;
@ -123,7 +124,7 @@ public class UpdateServer extends Thread{
public static ArrayList<FileHash> getFileList(String path) throws Exception{ public static ArrayList<FileHash> getFileList(String path) throws Exception{
ArrayList<FileHash> fileHash = new ArrayList<FileHash>(); ArrayList<FileHash> fileHash = new ArrayList<FileHash>();
ArrayList<File> files = FileFinder.search(FileFinder.find(path)); List<File> files = FileFinder.search(FileFinder.find(path));
for(File file : files){ for(File file : files){
fileHash.add(new FileHash( fileHash.add(new FileHash(
FileFinder.relativePath(file, path), FileFinder.relativePath(file, path),

19
src/zutil/network/http/soap/SOAPHttpPage.java
View file

@ -41,7 +41,6 @@ import org.dom4j.Document;
import org.dom4j.DocumentException; import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper; import org.dom4j.DocumentHelper;
import org.dom4j.Element; import org.dom4j.Element;
import org.dom4j.Namespace;
import org.dom4j.io.OutputFormat; import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter; import org.dom4j.io.XMLWriter;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
@ -218,7 +217,6 @@ public class SOAPHttpPage implements HttpPage{
if(session_enabled) session.put("SOAPInterface", obj); if(session_enabled) session.put("SOAPInterface", obj);
} }
Document document = soapResponse( request.get(""), obj); Document document = soapResponse( request.get(""), obj);
OutputFormat format = OutputFormat.createPrettyPrint(); OutputFormat format = OutputFormat.createPrettyPrint();
@ -227,8 +225,8 @@ public class SOAPHttpPage implements HttpPage{
/* /*
// DEBUG // DEBUG
System.out.println("Request"); System.err.println("Request");
System.out.println(request); System.err.println(request);
System.out.println("Response"); System.out.println("Response");
writer = new XMLWriter( System.out, format ); writer = new XMLWriter( System.out, format );
writer.write( document ); writer.write( document );
@ -257,8 +255,9 @@ public class SOAPHttpPage implements HttpPage{
Document document = DocumentHelper.createDocument(); Document document = DocumentHelper.createDocument();
Element envelope = document.addElement("soap:Envelope"); Element envelope = document.addElement("soap:Envelope");
try { try {
envelope.add(new Namespace("soap", "http://schemas.xmlsoap.org/soap/envelope/")); envelope.addNamespace("soap", "http://schemas.xmlsoap.org/soap/envelope/");
envelope.addAttribute("soap:encodingStyle", "http://schemas.xmlsoap.org/soap/envelope/"); envelope.addNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
envelope.addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
Element body = envelope.addElement( "soap:Body" ); Element body = envelope.addElement( "soap:Body" );
try{ try{
@ -326,7 +325,8 @@ public class SOAPHttpPage implements HttpPage{
// generate response xml // generate response xml
if(m.method.getReturnType() != void.class){ if(m.method.getReturnType() != void.class){
Element response = responseRoot.addElement(m.method.getName()+"Response"); responseRoot.addNamespace("m", url+""+m.method.getName());
Element response = responseRoot.addElement("m:"+m.method.getName()+"Response");
generateReturnXML(response, ret, m.returnName, m); generateReturnXML(response, ret, m.returnName, m);
} }
} }
@ -371,7 +371,7 @@ public class SOAPHttpPage implements HttpPage{
if(ret instanceof Element) if(ret instanceof Element)
root.add( (Element)ret ); root.add( (Element)ret );
if(ret instanceof SOAPObject){ if(ret instanceof SOAPObject){
Element objectE = root.addElement( getClassSOAPName(ret.getClass()) ); Element objectE = root.addElement( ename ); //getClassSOAPName(ret.getClass())
Field[] fields = ret.getClass().getFields(); Field[] fields = ret.getClass().getFields();
for(int i=0; i<fields.length ;i++){ for(int i=0; i<fields.length ;i++){
SOAPFieldName tmp = fields[i].getAnnotation(SOAPObject.SOAPFieldName.class); SOAPFieldName tmp = fields[i].getAnnotation(SOAPObject.SOAPFieldName.class);
@ -707,7 +707,7 @@ public class SOAPHttpPage implements HttpPage{
private void generateWSDLType(ArrayList<Class<?>> types){ private void generateWSDLType(ArrayList<Class<?>> types){
wsdlType = DocumentHelper.createDocument(); wsdlType = DocumentHelper.createDocument();
Element definitions = wsdlType.addElement( "wsdl:definitions" ); Element definitions = wsdlType.addElement( "wsdl:definitions" );
definitions.addAttribute("targetNamespace", url+"?type"); definitions.addAttribute("targetNamespace", url);
definitions.addNamespace("tns", url+"?type"); definitions.addNamespace("tns", url+"?type");
definitions.addNamespace("xsd", "http://www.w3.org/2001/XMLSchema"); definitions.addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
definitions.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/"); definitions.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
@ -800,3 +800,4 @@ public class SOAPHttpPage implements HttpPage{
return c; return c;
} }
} }