Subversion Repositories XServices

Compare Revisions

Ignore whitespace Rev 63 → Rev 64

/xservices/trunk/src/java/net/brutex/xservices/ws/impl/FileServiceImpl.java
23,6 → 23,7
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Iterator;
import java.util.List;
 
import javax.activation.DataHandler;
57,6 → 58,8
import org.apache.tools.ant.taskdefs.optional.unix.Chgrp;
import org.apache.tools.ant.taskdefs.optional.unix.Chown;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.ResourceCollection;
 
/**
*
73,9 → 76,18
*/
@Override
@WebMethod(operationName = "basename")
public ReturnCode basename(@WebParam(name = "file") String filename,
public String basename(@WebParam(name = "file") String filename,
@WebParam(name = "suffix") String suffix) {
return basename(new File(filename), suffix);
final String BASENAME_VALUE = "basename.value";
Basename basename = new Basename();
RunTask runner = new RunTask(basename);
basename.setFile(new File(filename));
if (suffix != null && !suffix.equals("")) {
basename.setSuffix(suffix);
}
basename.setProperty("BASENAME_VALUE");
ReturnCode r = runner.postTask();
return r.getProperty("BASENAME_VALUE");
}
 
@WebMethod(operationName = "replaceInFile")
205,6 → 217,21
@WebParam(name = "encoding") String encoding) throws XServicesFault {
return copy(src, new File(todir), plm, overwrite, encoding);
}
@Override
public ReturnCode copyFile(String fromFile,
String tofile,
boolean overwrite) throws XServicesFault {
Copy copy = new Copy();
copy.setTaskName("Copy");
RunTask runner = new RunTask(copy);
File f = new File(fromFile);
if( ! f.isFile() ) throw new XServicesFault("File '"+fromFile+"' not found.");
copy.setFile( new File( fromFile ));
copy.setTofile(new File(tofile));
copy.setOverwrite(overwrite);
return runner.postTask();
}
 
/*
* (non-Javadoc)
215,12 → 242,20
*/
@Override
@WebMethod(operationName = "loadResource")
public ReturnCode loadRes(@WebParam(name = "resource") FileResource res,
public String loadRes(@WebParam(name = "resource") FileResource res,
@WebParam(name = "encoding") String encoding) {
if (encoding == null || encoding.equals("")) {
encoding = System.getProperty("file.encoding");
}
return loadResource(res, encoding);
LoadResource lr = new LoadResource();
lr.setTaskName("LoadResource");
RunTask runner = new RunTask(lr);
lr.addConfigured(res.getAntResource(lr.getProject()));
lr.setEncoding(encoding);
System.out.println("Using encoding: " + encoding);
lr.setProperty("LoadResource.out");
ReturnCode r = runner.postTask();
return r.getProperty("LoadResource.out");
}
 
/*
232,13 → 267,22
*/
@Override
@WebMethod(operationName = "loadResourceFromArchive")
public ReturnCode loadResFromArchive(
public String loadResFromArchive(
@WebParam(name = "archiveresource") ArchiveResource res,
@WebParam(name = "encoding") String encoding) {
if (encoding == null || encoding.equals("")) {
encoding = System.getProperty("file.encoding");
}
return loadResource(res, encoding);
LoadResource lr = new LoadResource();
lr.setTaskName("LoadResource");
RunTask runner = new RunTask(lr);
lr.addConfigured(res.getAntResource(lr.getProject()));
lr.setEncoding(encoding);
System.out.println("Using encoding: " + encoding);
lr.setProperty("LoadResource.out");
ReturnCode r = runner.postTask();
return r.getProperty("LoadResource.out");
}
 
/*
302,30 → 346,6
}
 
@WebMethod(exclude = true)
private ReturnCode basename(File file, String suffix) {
Basename basename = new Basename();
RunTask runner = new RunTask(basename);
basename.setFile(file);
if (suffix != null && !suffix.equals("")) {
basename.setSuffix(suffix);
}
basename.setProperty("basename.value");
return runner.postTask();
}
 
@WebMethod(exclude = true)
private ReturnCode loadResource(ResourceInterface src, String encoding) {
LoadResource lr = new LoadResource();
lr.setTaskName("LoadResource");
RunTask runner = new RunTask(lr);
lr.addConfigured(src.getAntResource(lr.getProject()));
lr.setEncoding(encoding);
System.out.println("Using encoding: " + encoding);
lr.setProperty("LoadResource.out");
return runner.postTask();
}
 
@WebMethod(exclude = true)
private ReturnCode echo(String msg, File file, String encoding,
boolean append) {
Echo echo = new Echo();