Subversion Repositories XServices

Compare Revisions

No changes between revisions

Ignore whitespace Rev 23 → Rev 22

/xservices/trunk/src/java/net/brutex/xservices/types/ContainsSelectorType.java
File deleted
/xservices/trunk/src/java/net/brutex/xservices/types/PatternSetType.java
File deleted
/xservices/trunk/src/java/net/brutex/xservices/types/PatternElement.java
File deleted
/xservices/trunk/src/java/net/brutex/xservices/types/SelectorTypeInterface.java
File deleted
/xservices/trunk/src/java/net/brutex/xservices/types/SelectorType.java
File deleted
/xservices/trunk/src/java/net/brutex/xservices/types/FileSetResource.java
31,7 → 31,7
* @author Brian Rosenberger, bru@brutex.de
*/
@XmlType(name = "FileSetType", namespace = "http://ws.xservices.brutex.net",
propOrder = {"type", "source", "filter", "excludes", "casesensitive"})
propOrder = {"type", "source", "includes", "excludes", "casesensitive"})
public class FileSetResource {
 
/**
51,9 → 51,8
* Pattern of files to include.
*
*/
@XmlElement(name = PatternSetType.XML_NAME, required = true, nillable = true)
public PatternSetType filter;
 
@XmlElement(name = "includes", required = true, nillable = false, defaultValue = "**/*")
public String includes = "";
/**
* Pattern of files to exclude.
*/
96,7 → 95,7
set.setDir(new File(source));
}
set.setProject(p);
//set.setIncludes(includes);
set.setIncludes(includes);
set.setExcludes(excludes);
set.setCaseSensitive(casesensitive);
 
/xservices/trunk/src/java/net/brutex/xservices/ws/MiscService.java
23,7 → 23,6
import net.brutex.xservices.types.MailMimeType;
import net.brutex.xservices.types.ReturnCode;
import net.brutex.xservices.util.BrutexNamespaces;
import org.apache.cxf.annotations.WSDLDocumentation;
 
/**
*
32,24 → 31,9
@WebService(targetNamespace = BrutexNamespaces.WS_XSERVICES)
public interface MiscService {
 
/**
* @param hostname
* @return
*/
@WebMethod(operationName = "getHostinfo")
public ReturnCode getHostinfo(@WebParam(name = "hostname") String hostname);
 
/**
*
* @param mailhost
* @param from
* @param tolist
* @param subject
* @param message
* @return
*/
@WebMethod(operationName = "sendMailSimple")
public ReturnCode sendMailSimple(@WebParam(name = "mailhost") HostConnection mailhost,
@WebParam(name = "from") String from,
57,16 → 41,6
@WebParam(name = "subject") String subject,
@WebParam(name = "message") String message);
 
/**
*
* @param mailhost
* @param from
* @param tolist
* @param subject
* @param message
* @param res
* @return
*/
@WebMethod(operationName = "sendMailSimpleWithAttachment")
public ReturnCode sendMailSimpleWithAttachment(@WebParam(name = "mailhost") HostConnection mailhost,
@WebParam(name = "from") String from,
75,22 → 49,6
@WebParam(name = "message") String message,
@WebParam(name = "attachments") FileSetResource res);
 
/**
*
* @param mailhost
* @param from
* @param tolist
* @param cclist
* @param bcclist
* @param subject
* @param mimetype
* @param charset
* @param message
* @param res
* @param ssl
* @param tls
* @return
*/
@WebMethod(operationName = "sendMail")
public ReturnCode sendMail(@WebParam(name = "mailhost") HostConnection mailhost,
@WebParam(name = "from") String from,
105,12 → 63,6
@WebParam(name = "useSSL") boolean ssl,
@WebParam(name = "useStartTLS") boolean tls);
 
/**
*
* @param minutes
* @param seconds
* @return
*/
@WebMethod(operationName = "sleep")
public ReturnCode sleep(@WebParam(name = "minutes") int minutes,
@WebParam(name = "seconds") int seconds);
/xservices/trunk/src/java/net/brutex/xservices/ws/MiscServiceImpl.java
22,8 → 22,6
import net.brutex.xservices.types.MailMimeType;
import net.brutex.xservices.types.ReturnCode;
import net.brutex.xservices.util.RunTask;
import org.apache.cxf.annotations.WSDLDocumentation;
import org.apache.cxf.annotations.WSDLDocumentationCollection;
import org.apache.tools.ant.taskdefs.HostInfo;
import org.apache.tools.ant.taskdefs.Sleep;
import org.apache.tools.ant.taskdefs.email.EmailTask;
32,20 → 30,10
*
* @author Brian Rosenberger, bru@brutex.de
*/
@WSDLDocumentationCollection(
{
@WSDLDocumentation("My portType documentation"),
@WSDLDocumentation(value = "My top level documentation",
placement = WSDLDocumentation.Placement.TOP),
@WSDLDocumentation(value = "My binding doc",
placement = WSDLDocumentation.Placement.BINDING)
}
)
@WebService(endpointInterface="net.brutex.xservices.ws.MiscService",
serviceName="MiscService")
public class MiscServiceImpl implements MiscService {
 
@WSDLDocumentation(value="Get information about a host.")
public ReturnCode getHostinfo(String hostname) {
return antGetHostinfo(hostname, null);
}
/xservices/trunk/lib/cxf-2.3.0-SNAPSHOT.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/xservices/trunk/lib/cxf-2.2.6.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:executable
+*
\ No newline at end of property
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/xservices/trunk/nbproject/project.properties
33,7 → 33,6
file.reference.ant-apache-oro.jar=lib/ant-apache-oro.jar
file.reference.ant-apache-regexp.jar=lib/ant-apache-regexp.jar
file.reference.ant-apache-resolver.jar=lib/ant-apache-resolver.jar
file.reference.ant-apache-xalan2.jar=lib/ant-apache-xalan2.jar
file.reference.ant-commons-logging.jar=lib/ant-commons-logging.jar
file.reference.ant-commons-net.jar=lib/ant-commons-net.jar
file.reference.ant-jai.jar=lib/ant-jai.jar
60,7 → 59,7
file.reference.commons-logging-api-1.0.4.jar=lib/commons-logging-api-1.0.4.jar
file.reference.commons-net-2.0.jar=lib/commons-net-2.0.jar
file.reference.commons-net-ftp-2.0.jar=lib/commons-net-ftp-2.0.jar
file.reference.cxf-2.3.0-SNAPSHOT.jar=lib/cxf-2.3.0-SNAPSHOT.jar
file.reference.cxf-2.2.6.jar=lib/cxf-2.2.6.jar
file.reference.jakarta-oro-2.0.8.jar=lib/jakarta-oro-2.0.8.jar
file.reference.java-unrar-0.3.jar=lib/java-unrar-0.3.jar
file.reference.jettison-1.2.jar=lib/jettison-1.2.jar
118,6 → 117,7
${file.reference.ant.jar}:\
${file.reference.commons-collections-3.2.1.jar}:\
${file.reference.commons-lang-2.4.jar}:\
${file.reference.cxf-2.2.6.jar}:\
${file.reference.neethi-2.0.4.jar}:\
${file.reference.aopalliance-1.0.jar}:\
${file.reference.spring-beans-2.5.6.jar}:\
139,9 → 139,7
${file.reference.jettison-1.2.jar}:\
${file.reference.jsr311-api-1.0.jar}:\
${file.reference.xml-resolver-1.2.jar}:\
${libs.metro.classpath}:\
${file.reference.ant-apache-xalan2.jar}:\
${file.reference.cxf-2.3.0-SNAPSHOT.jar}
${libs.metro.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
/xservices/trunk/nbproject/project.xml
150,6 → 150,10
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.cxf-2.2.6.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.neethi-2.0.4.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
237,14 → 241,6
<file>${libs.metro.classpath}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.ant-apache-xalan2.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.cxf-2.3.0-SNAPSHOT.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
</web-module-libraries>
<web-module-additional-libraries/>
<source-roots>
/xservices/trunk/nbproject/genfiles.properties
1,9 → 1,9
build.xml.data.CRC32=61687631
build.xml.data.CRC32=6aca1953
build.xml.script.CRC32=d8ac74c8
build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=61687631
nbproject/build-impl.xml.script.CRC32=ed225302
nbproject/build-impl.xml.data.CRC32=6aca1953
nbproject/build-impl.xml.script.CRC32=a300afa5
nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
nbproject/jaxws-build.xml.stylesheet.CRC32=83928735
/xservices/trunk/nbproject/build-impl.xml
563,6 → 563,7
<copyfiles files="${file.reference.ant.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.commons-collections-3.2.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.cxf-2.2.6.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.neethi-2.0.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.aopalliance-1.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.spring-beans-2.5.6.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
585,8 → 586,6
<copyfiles files="${file.reference.jsr311-api-1.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.xml-resolver-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${libs.metro.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.ant-apache-xalan2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.cxf-2.3.0-SNAPSHOT.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
626,6 → 625,7
<copyfiles files="${file.reference.ant.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-collections-3.2.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.cxf-2.2.6.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.neethi-2.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.aopalliance-1.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.spring-beans-2.5.6.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
648,8 → 648,6
<copyfiles files="${file.reference.jsr311-api-1.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xml-resolver-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${libs.metro.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.ant-apache-xalan2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.cxf-2.3.0-SNAPSHOT.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
<delete dir="${build.web.dir}/WEB-INF/lib"/>