WebSVN – XServices – Diff – /xservices/trunk/src/java/net/brutex/xservices/ws/impl/FileServiceImpl.java

  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
 package net.brutex.xservices.ws.impl;
 import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
+import java.io.InputStream;
 import java.util.List;
 import javax.activation.DataHandler;
 import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
+import javax.jws.WebParam;
 import javax.jws.WebService;
 import net.brutex.xservices.types.AntProperty;
 import net.brutex.xservices.types.ArchiveResource;
 import net.brutex.xservices.types.AttachmentType;
-import net.brutex.xservices.types.FileResource;
-import net.brutex.xservices.types.FileSetResource;
+import net.brutex.xservices.types.FileResource;
-import net.brutex.xservices.types.ReplacePattern;
+import net.brutex.xservices.types.FileSetResource;
-import net.brutex.xservices.types.ResourceInterface;
+import net.brutex.xservices.types.ReplacePattern;
 import net.brutex.xservices.types.ReturnCode;
 import net.brutex.xservices.util.BrutexNamespaces;
-import net.brutex.xservices.util.RunTask;
-import net.brutex.xservices.ws.FileService;
-import net.brutex.xservices.ws.XServicesFault;
+import net.brutex.xservices.util.RunTask;
 import net.brutex.xservices.ws.FileService;
-import org.apache.commons.codec.binary.Base64;
+import net.brutex.xservices.ws.XServicesFault;
 import org.apache.commons.codec.binary.Base64InputStream;
 import org.apache.cxf.aegis.type.mtom.StreamDataSource;
 import org.apache.tools.ant.taskdefs.Replace;
 import org.apache.tools.ant.taskdefs.optional.ReplaceRegExp;
 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;
 /**
+ *
  * @author Brian Rosenberger, bru@brutex.de
+	 *
 	 * @see net.brutex.xservices.ws.impl.FileService#basename(java.lang.String,
 	 * java.lang.String)
 	 */
 	@Override
-	@WebMethod(operationName = "basename")
-	public String basename(@WebParam(name = "file") String filename,
+	public String basename(String filename, String suffix) {
-			@WebParam(name = "suffix") String 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");
+		basename.setProperty(BASENAME_VALUE);
 		ReturnCode r = runner.postTask();
-		return r.getProperty("BASENAME_VALUE");
+		return r.getProperty(BASENAME_VALUE);
+	}
-	@WebMethod(operationName = "replaceInFile")
-	public ReturnCode replaceInFile(
-			@WebParam(name = "file") FileResource res,
-			@WebParam(name = "search") String search,
+	public ReturnCode replaceInFile(FileResource res, String search,
-			@WebParam(name = "replace") String replace) {
+			String replace) throws XServicesFault {
 		ReturnCode r = null;
 		Replace rep = new Replace();
 		rep.setTaskName("Replace");
 		RunTask runner = new RunTask(rep);
 		rep.addConfigured(res.getAntResource(rep.getProject()));
 		rep.setToken(search);
+		rep.setValue(replace);
-		rep.setValue(replace);
+		try {
+			r = runner.postTask();
+		} catch (BuildException e) {
+			throw new XServicesFault(e);
 		r = runner.postTask();
 		return r;
 	}
-	@WebMethod(operationName = "replaceInFile2")
-	public ReturnCode replaceInFile2(
-			@WebParam(name = "file") FileResource res,
+	public ReturnCode replaceInFile2(FileResource res,
-			@WebParam(name = "patternList") List<ReplacePattern> patternList) {
+			List<ReplacePattern> patternList) throws XServicesFault {
 		ReturnCode r = null;
 		for (ReplacePattern pat : patternList) {
 			Replace rep = new Replace();
 			rep.setTaskName("Replace");
 			RunTask runner = new RunTask(rep);
 			rep.addConfigured(res.getAntResource(rep.getProject()));
 			rep.setToken(pat.search);
+			rep.setValue(pat.replace);
-			rep.setValue(pat.replace);
+			try {
+				r = runner.postTask();
+			} catch (BuildException e) {
+				throw new XServicesFault(e);
 			r = runner.postTask();
+		}
 		return r;
 	}
-	@WebMethod(operationName = "replaceInFileRegEx")
-	public ReturnCode replaceInFileRegEx(
-			@WebParam(name = "file") FileResource res,
-			@WebParam(name = "search") String search,
-			@WebParam(name = "replace") String replace,
+	public ReturnCode replaceInFileRegEx(FileResource res, String search,
-			@WebParam(name = "flags") String flags) {
+			String replace, String flags) throws XServicesFault {
 		ReplaceRegExp rep = new ReplaceRegExp();
 		rep.setTaskName("ReplaceRegExp");
 		RunTask runner = new RunTask(rep);
 		File infile = new File(res.uri);
 		rep.setFile(infile);
 		rep.setMatch(search);
 		rep.setReplace(replace);
+		rep.setFlags(flags);
-		rep.setFlags(flags);
+		try {
-		ReturnCode r = runner.postTask();
+			ReturnCode r = runner.postTask();
+			return r;
+		} catch (BuildException e) {
+			throw new XServicesFault(e);
 		return r;
-	}
+	}
 	/*
 	 * (non-Javadoc)
+	 *
 	 * @see
 	 * net.brutex.xservices.ws.impl.FileService#base64Encode(net.brutex.xservices
 	 * .types.FileSetResource)
 	 */
-	@Override
-	@WebMethod(operationName = "downloadFile")
+	@Override
-	public AttachmentType downloadFile(@WebParam(name = "file") FileResource res) {
+	public AttachmentType downloadFile(FileResource res) throws XServicesFault {
 		InputStream is = null;
 		try {
+			is = res.getAntResource(null).getInputStream();
+			StreamDataSource ssource = new StreamDataSource(
+					"application/binary", is);
+			DataHandler h = new DataHandler(ssource);
+			AttachmentType t = new AttachmentType();
+			t.setContent(h);
+			t.setFilename(res.getAntResource(null).getName());
-			is = res.getAntResource(null).getInputStream();
+			return t;
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
+		} catch (IOException e) {
-			e.printStackTrace();
+			throw new XServicesFault(e);
-		}
-		DataHandler h = new DataHandler(new StreamDataSource(
-				"application/binary", is));
-		AttachmentType t = new AttachmentType();
-		t.setContent(h);
-		t.setFilename(res.getAntResource(null).getName());
 		return t;
+	}
 	/*
 	 * (non-Javadoc)
+	 *
 	 * @see
 	 * net.brutex.xservices.ws.impl.FileService#base64Decode(net.brutex.xservices
 	 * .types.AttachmentType)
-	 */
-	@Override
+	 */
-	@WebMethod(operationName = "uploadFile")
+	@Override
-	public String uploadFile(@WebParam(name = "file") AttachmentType file) {
+	public String uploadFile(AttachmentType file) throws XServicesFault {
-		DataHandler h =  file.getContent();
+		DataHandler h = file.getContent();
 		File f = new File(file.getFilename());
 		FileOutputStream fout;
-		try {
-			fout = new FileOutputStream(f);
-			/*
-			 * InputStream in = h.getInputStream();
-			int b;
-			while( (b=in.read())!= -1 ) {
-				fout.write(b);
 		try {
-			*/
+			fout = new FileOutputStream(f);
 			h.writeTo(fout);
-			fout.flush();
-			fout.close();
+			fout.flush();
-			//in.close();
+			fout.close();
 		} catch (FileNotFoundException e) {
-			throw new BuildException(e);
+			throw new XServicesFault(e);
 		} catch (IOException e) {
-			throw new BuildException(e);
+			throw new XServicesFault(e);
+		}
 		return file.getFilename();
 	 * @see
 	 * net.brutex.xservices.ws.impl.FileService#copy(net.brutex.xservices.types
 	 * .FileSetResource, java.lang.String, boolean, boolean, java.lang.String)
 	 */
 	@Override
+	public ReturnCode copy(FileSetResource src, String todir, boolean plm,
+			boolean overwrite, String encoding) throws XServicesFault {
+		Copy copy = new Copy();
-	@WebMethod(operationName = "copy")
+		copy.setTaskName("Copy");
+		RunTask runner = new RunTask(copy);
-	public ReturnCode copy(@WebParam(name = "fileset") FileSetResource src,
+		FileSet set = src.getAntResource(copy.getProject());
+		copy.add(set);
-			@WebParam(name = "todir") String todir,
+		File dst = new File(todir);
+		if (dst.isDirectory()) {
+			copy.setTodir(dst);
+		}
+		if (dst.isFile()) {
+			copy.setTofile(dst);
+		}
+		copy.setOverwrite(overwrite);
-			@WebParam(name = "preservelastmodified") boolean plm,
+		copy.setPreserveLastModified(plm);
-			@WebParam(name = "overwrite") boolean overwrite,
+		if (encoding != null && !encoding.equals("")) {
-			@WebParam(name = "encoding") String encoding) throws XServicesFault {
+			copy.setOutputEncoding(encoding);
+		} else {
-		return copy(src, new File(todir), plm, overwrite, encoding);
+			copy.setOutputEncoding(System.getProperty("file.encoding"));
+		}
+		return runner.postTask();
 	}
 	@Override
-	public ReturnCode copyFile(String fromFile,
+	public ReturnCode copyFile(String fromFile, String tofile, boolean overwrite)
-								String tofile,
-								boolean overwrite) throws XServicesFault {
+			throws XServicesFault {
 		Copy copy = new Copy();
 		copy.setTaskName("Copy");
 		RunTask runner = new RunTask(copy);
 		File f = new File(fromFile);
+		if (!f.isFile())
-		if( ! f.isFile() ) throw new XServicesFault("File '"+fromFile+"' not found.");
+			throw new XServicesFault("File '" + fromFile + "' not found.");
-		copy.setFile( new File( fromFile ));
+		copy.setFile(new File(fromFile));
 		copy.setTofile(new File(tofile));
 		copy.setOverwrite(overwrite);
 		return runner.postTask();
+	}
 	 * @see
 	 * net.brutex.xservices.ws.impl.FileService#loadRes(net.brutex.xservices
 	 * .types.FileResource, java.lang.String)
 	 */
 	@Override
-	@WebMethod(operationName = "loadResource")
-	public String loadRes(@WebParam(name = "resource") FileResource res,
+	public String loadRes(FileResource res, String encoding)
-			@WebParam(name = "encoding") String encoding) {
+			throws XServicesFault {
 		if (encoding == null || encoding.equals("")) {
 			encoding = System.getProperty("file.encoding");
+		}
 		LoadResource lr = new LoadResource();
 		lr.setTaskName("LoadResource");
 	 * @see
 	 * net.brutex.xservices.ws.impl.FileService#loadResFromArchive(net.brutex
 	 * .xservices.types.ArchiveResource, java.lang.String)
 	 */
 	@Override
-	@WebMethod(operationName = "loadResourceFromArchive")
-	public String loadResFromArchive(
+	public String loadResFromArchive(ArchiveResource res, String encoding) {
-			@WebParam(name = "archiveresource") ArchiveResource res,
-			@WebParam(name = "encoding") String encoding) {
 		if (encoding == null || encoding.equals("")) {
 			encoding = System.getProperty("file.encoding");
+		}
 		LoadResource lr = new LoadResource();
 		lr.setTaskName("LoadResource");
 		lr.setEncoding(encoding);
 		System.out.println("Using encoding: " + encoding);
 		lr.setProperty("LoadResource.out");
 		ReturnCode r = runner.postTask();
 		return r.getProperty("LoadResource.out");
+	}
 	/*
 	 * (non-Javadoc)
+	 *
 	 * @see net.brutex.xservices.ws.impl.FileService#echo2file(java.lang.String,
 	 * java.lang.String, java.lang.String, boolean)
 	 */
+	@Override
+	public ReturnCode echo2file(String message, String file, String encoding,
+			boolean append) throws XServicesFault {
-	@Override
+		Echo echo = new Echo();
+		echo.setTaskName("toFile");
+		RunTask runTask = new RunTask(echo);
+		echo.addText(message);
+		echo.setEncoding(encoding);
+		File f = new File(file);
+		try {
+			if (!f.canWrite())
-	@WebMethod(operationName = "echoToFile")
+				throw new XServicesFault("Cannot write to file: "
+						+ f.getCanonicalPath());
+			echo.setFile(f);
-	public ReturnCode echo2file(@WebParam(name = "message") String message,
+			echo.setAppend(append);
+			ReturnCode c = runTask.postTask();
+			return c;
-			@WebParam(name = "file") String file,
+		} catch (BuildException e) {
-			@WebParam(name = "encoding") String encoding,
+			throw new XServicesFault("Error in echo2file.", e);
-			@WebParam(name = "append") boolean append) {
+		} catch (IOException e) {
+			throw new XServicesFault("Cannot write to file.", e);
 		return echo(message, new File(file), encoding, append);
+	}
 	/*
 	 * (non-Javadoc)
+	 *
 	 * @see
 	 * net.brutex.xservices.ws.impl.FileService#changeOwner(net.brutex.xservices
 	 * .types.FileSetResource, java.lang.String)
 	 */
 	@Override
+	public ReturnCode changeOwner(FileSetResource res, String owner) {
-	@WebMethod(operationName = "changeOwner")
+		Chown chown = new Chown();
-	public ReturnCode changeOwner(
+		chown.setTaskName("Chown");
+		RunTask runner = new RunTask(chown);
+		chown.setOwner(owner);
+		FileSet set = res.getAntResource(chown.getProject());
-			@WebParam(name = "fileset") FileSetResource res,
+		chown.add(set);
-			@WebParam(name = "owner") String owner) {
+		chown.setMaxParallel(300);
-		return chown(res, owner);
+		return runner.postTask();
+	}
 	/*
 	 * (non-Javadoc)
+	 *
 	 * @see
 	 * net.brutex.xservices.ws.impl.FileService#changeGroup(net.brutex.xservices
 	 * .types.FileSetResource, java.lang.String)
 	 */
+	@Override
-	@Override
+	public ReturnCode changeGroup(FileSetResource res, String group) {
-	@WebMethod(operationName = "changeGroup")
+		Chgrp chgrp = new Chgrp();
+		chgrp.setTaskName("Chgrp");
+		RunTask runner = new RunTask(chgrp);
+		chgrp.setGroup(group);
-	public ReturnCode changeGroup(
+		FileSet set = res.getAntResource(chgrp.getProject());
-			@WebParam(name = "fileset") FileSetResource res,
+		chgrp.add(set);
-			@WebParam(name = "group") String group) {
+		chgrp.setMaxParallel(300);
-		return chgrp(res, group);
+		return runner.postTask();
+	}
 	/*
 	 * (non-Javadoc)
+	 *
 	 * @see
-	 * net.brutex.xservices.ws.impl.FileService#changeMode(net.brutex.xservices
-	 * .types.FileSetResource, java.lang.String)
-	 */
-	@Override
-	@WebMethod(operationName = "changeMode")
-	public ReturnCode changeMode(
-			@WebParam(name = "fileset") FileSetResource res,
-			@WebParam(name = "permissions") String perm) {
-		return chmod(res, perm);
-	}
-	@WebMethod(exclude = true)
-	private ReturnCode echo(String msg, File file, String encoding,
-			boolean append) {
-		Echo echo = new Echo();
-		echo.setTaskName("toFile");
-		RunTask runTask = new RunTask(echo);
-		echo.addText(msg);
-		echo.setEncoding(encoding);
-		echo.setFile(file);
-		echo.setAppend(append);
-		return runTask.postTask();
-	}
-	@WebMethod(exclude = true)
-	private ReturnCode copy(FileSetResource src, File dst,
-			boolean preservelastmodified, boolean overwrite, String encoding) {
-		Copy copy = new Copy();
-		copy.setTaskName("Copy");
-		RunTask runner = new RunTask(copy);
-		FileSet set = src.getAntResource(copy.getProject());
-		copy.add(set);
-		if (dst.isDirectory()) {
-			copy.setTodir(dst);
-		}
-		if (dst.isFile()) {
-			copy.setTofile(dst);
-		}
-		copy.setOverwrite(overwrite);
-		copy.setPreserveLastModified(preservelastmodified);
-		if (encoding != null && !encoding.equals("")) {
-			copy.setOutputEncoding(encoding);
-		} else {
-			copy.setOutputEncoding(System.getProperty("file.encoding"));
-		}
-		return runner.postTask();
-	}
-	@WebMethod(exclude = true)
-	private ReturnCode chown(FileSetResource src, String owner) {
-		Chown chown = new Chown();
-		chown.setTaskName("Chown");
-		RunTask runner = new RunTask(chown);
-		chown.setOwner(owner);
-		FileSet set = src.getAntResource(chown.getProject());
-		chown.add(set);
-		chown.setMaxParallel(300);
-		return runner.postTask();
-	}
-	@WebMethod(exclude = true)
-	private ReturnCode chgrp(FileSetResource src, String group) {
-		Chgrp chgrp = new Chgrp();
-		chgrp.setTaskName("Chgrp");
-		RunTask runner = new RunTask(chgrp);
-		chgrp.setGroup(group);
-		FileSet set = src.getAntResource(chgrp.getProject());
-		chgrp.add(set);
-		chgrp.setMaxParallel(300);
-		return runner.postTask();
+	 * net.brutex.xservices.ws.impl.FileService#changeMode(net.brutex.xservices
 	 * .types.FileSetResource, java.lang.String)
 	 */
-	@WebMethod(exclude = true)
+	@Override
-	private ReturnCode chmod(FileSetResource src, String perm) {
+	public ReturnCode changeMode(FileSetResource res, String perm) {
 		Chmod chmod = new Chmod();
 		chmod.setTaskName("Chmod");
 		RunTask runner = new RunTask(chmod);
-		FileSet set = src.getAntResource(chmod.getProject());
+		FileSet set = res.getAntResource(chmod.getProject());
 		chmod.add(set);

Subversion Repositories XServices

(root)/xservices/trunk/src/java/net/brutex/xservices/ws/impl/FileServiceImpl.java @ 65 – Rev 64 → 65