WebSVN – XServices – Path Comparison – /xservices/ Rev 81 and /xservices/ Rev 82

Ignore whitespace Rev 81 → Rev 82

/xservices/trunk/src/java/net/brutex/xservices/types/AttachmentType.java
File deleted

Property changes:
Deleted: svn:mime-type
-text/plain
\ No newline at end of property

/xservices/trunk/src/java/net/brutex/xservices/types/CollectionType.java
File deleted

Property changes:
Deleted: svn:mime-type
-text/plain
\ No newline at end of property

/xservices/trunk/src/java/net/brutex/xservices/types/ResourceSetInterface.java
File deleted

Property changes:
Deleted: svn:mime-type
-text/plain
\ No newline at end of property

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/ContainsSelectorType.java
 ,0 → 1,53
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.tools.ant.types.selectors.ContainsSelector;
+import org.apache.tools.ant.types.selectors.FileSelector;
+/**
+ *
+ * @author Brian Rosenberger, bru@brutex.de
+ */
+@XmlType
+public class ContainsSelectorType implements SelectorTypeInterface {
+    public static final String XML_NAME="contains";
+    public ContainsSelectorType() {
+    }
+    public FileSelector getSelector() {
+        ContainsSelector selector = new ContainsSelector();
+        selector.setCasesensitive(casesensitive);
+        selector.setText(text);
+        selector.setIgnorewhitespace(ignorewhitespace);
+        return selector;
+    }
+   @XmlElement(required=true, nillable=false)
+   public String text;
+   @XmlElement(required=true, defaultValue="true")
+   public boolean casesensitive;
+   @XmlElement(required=true, defaultValue="false")
+   public boolean ignorewhitespace;
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/SelectorType.java
 ,0 → 1,36
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import org.apache.tools.ant.types.selectors.FileSelector;
+/**
+ *
+ * @author Brian Rosenberger, bru@brutex.de
+ */
+public abstract class SelectorType implements SelectorTypeInterface {
+    public SelectorType() {
+    }
+    @XmlElement(name=ContainsSelectorType.XML_NAME, nillable=true)
+    public List<ContainsSelectorType> contains;
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/FileSetResource.java
 ,0 → 1,132
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import java.io.File;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.TarFileSet;
+import org.apache.tools.ant.types.ZipFileSet;
+/**
+ * Set of files from various sources.
+ *
+ * @author Brian Rosenberger, bru@brutex.de
+ */
+@XmlType(name = "FileSetType", namespace = "http://ws.xservices.brutex.net",
+propOrder = {"type", "source", "filter", "excludes", "casesensitive"})
+public class FileSetResource implements ResourceSetInterface {
+        public static final String XML_NAME = "fileset";
+    /**
+     * Type of FileSet
+     */
+    @XmlElement(name = "FileSetType", required = true, nillable = false, defaultValue = "FILES")
+    public FileSetType type = FileSetType.FILES;
+    /**
+     * File set source.
+     *
+     * Depends on the file set type. This is either an archive file or a
+     * directory.
+     */
+    @XmlElement(name = "source", required = true, nillable = false)
+    public String source = "";
+    /**
+     * Pattern of files to include.
+     *
+     */
+    @XmlElement(name = PatternSetType.XML_NAME, required = true, nillable = true)
+    public PatternSetType filter;
+    /**
+     * Pattern of files to exclude.
+     */
+    @XmlElement(name = "excludes", required = false, nillable = true, defaultValue = "")
+    public String excludes = "";
+    /**
+     * Case sensitivity for include/ exclude patterns.
+     */
+    @XmlElement(name = "casesensitive", required = true, nillable = false, defaultValue = "true")
+    public boolean casesensitive = true;
+    /**
+     * Get Ant FileSet for this file set.
+     *
+     * @param p     Ant project
+     * @return      Ant FileSet for this file set.
+     */
+    public FileSet getAntResource(Project p) {
+        FileSet set = null;
+        switch (type) {
+            case ZIP:
+                ZipFileSet zset = new ZipFileSet();
+                zset.setSrc(new File(source));
+                zset.setEncoding(System.getProperty("file.encoding"));
+                set = zset;
+                break;
+            case TAR:
+                TarFileSet tset = new TarFileSet();
+                tset.setSrc(new File(source));
+                set = tset;
+                break;
+            case GZTAR:
+                Resource res = new FileResource(FileResource.Type.GZIP, source).getAntResource(p);
+                TarFileSet gzset = new TarFileSet();
+                gzset.setSrcResource(res);
+                set = gzset;
+                break;
+            default: //FILES
+                set = new FileSet();
+                set.setDir(new File(source));
+        }
+        set.setProject(p);
+        //set.setIncludes(includes);
+        set.setExcludes(excludes);
+        set.setCaseSensitive(casesensitive);
+        return set;
+    }
+    /**
+     * File set types.
+     */
+    @XmlEnum()
+    @XmlType(name="resourcetype")
+    public enum FileSetType {
+        /**
+         * Set of files (this is based on a directory, so provide a path only
+         * as file set source).
+         */
+        FILES,
+        /**
+         * Set of files inside a ZIP archive.
+         */
+        ZIP,
+        /**
+         * Set of files inside a TAR archive (without compression).
+         */
+        TAR,
+        /**
+         * Set of files inside a gzip compressed TAR archive.
+         */
+        GZTAR
+    }
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/SelectorTypeInterface.java
 ,0 → 1,27
+/*
+ *   Copyright 2011 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import org.apache.tools.ant.types.selectors.FileSelector;
+/**
+ *
+ * @author Brian Rosenberger
+ */
+public interface SelectorTypeInterface {
+        public FileSelector getSelector();
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/ResourceSetInterface.java
 ,0 → 1,35
+/*
+ *   Copyright 2011 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+/**
+ * Wrapper for Ant Resource Sets. A resource set
+ * is simply a collection of resources.
+ *
+ * @author Brian Rosenberger, bru@brutex.de
+ */
+package net.brutex.xservices.types.ant;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.ResourceCollection;
+/**
+ * Wrapper for Ant Resource Collection.
+ *
+ * @author Brian Rosenberger, bru@brutex.de
+ */
+public interface ResourceSetInterface {
+        public ResourceCollection getAntResource(Project p);
+}
 Property changes:
 Added: svn:mime-type
 +text/plain
 \ No newline at end of property

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/AntProperty.java
 ,0 → 1,75
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+/**
+ * Generic key/ value pairs.
+ *
+ * @author Brian Rosenberger
+ */
+@XmlRootElement
+public class AntProperty {
+    /**
+     * Key of the entry.
+     */
+    @XmlElement(required=true)
+    public String name ="";
+    /**
+     * Value of the entry.
+     */
+    @XmlElement(required=true)
+    public String value="";
+    /**
+     * Converts a Map&lt;String, String&gt; into a list of
+     * AntProperties.
+     * @param map   The map to convert
+     * @return      A list of key/value pairs
+     */
+    public static List<AntProperty> createAntPropertyList(Map<String, String> map) {
+        List<AntProperty> list = new ArrayList<AntProperty>();
+        for(Map.Entry<String, String> e : map.entrySet()) {
+            list.add(new AntProperty(e.getKey(), e.getValue()));
+        }
+        return list;
+    }
+    /**
+     * Creates a new AntProperty.
+     * @param name
+     * @param value
+     */
+    public AntProperty(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+    /**
+     * Creates a new AntProperty.
+     */
+    public AntProperty() {
+    }
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/FileResource.java
 ,0 → 1,139
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import java.io.File;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+import net.brutex.xservices.util.BrutexNamespaces;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.resources.BZip2Resource;
+import org.apache.tools.ant.types.resources.GZipResource;
+import org.apache.tools.ant.types.resources.URLResource;
+/**
+ * File based resource declaration.
+ *
+ *
+ * @author Brian Rosenberger, bru@brutex.de
+ */
+@XmlType(name="FileResourceType", namespace=BrutexNamespaces.WS_XSERVICES)
+public class FileResource
+implements ResourceInterface {
+        public static final String XML_NAME = "file";
+    /**
+     * File resource type.
+     */
+    @XmlElement(defaultValue = "FILE", nillable = false, required = true)
+    public Type type = Type.FILE;
+    /**
+     * URI to file.
+     *
+     * Examples:<br>
+     * <code>c:/path/to/myfile.txt<br>
+     * /usr/share/file<br>
+     * http://server/path/file.zip</code>
+     */
+    @XmlElement(nillable = false, required = true)
+    public String uri;
+    /**
+     * File resource type.
+     *
+     * Defines the wrapper around the source.
+     */
+    @XmlEnum(value=String.class)
+    public enum Type {
+        /**
+         * Plain file from OS accessible file system.
+         */
+        FILE,
+        /**
+         * File from URL (http, https, ftp, ...)
+         */
+        URL,
+        /**
+         * File from file system with on-the-fly GZIP decompression
+         */
+        GZIP,
+        /**
+         * File from file system with on-the-fly BZIP2 decompression
+         */
+        BZIP2
+    }
+    /**
+     * Creates a FileResource.
+     *
+     * @param type      file resource type
+     * @param uri       file resource uri
+     */
+    public FileResource(Type type, String uri) {
+        this.type = type;
+        this.uri = uri;
+    }
+    /**
+     * Create an empty FileResource
+     */
+    public FileResource() {
+    }
+    /**
+     * Get Apache Ant Resource type.
+     *
+     * @param p     Ant project
+     * @return      This FileResource as Ant Resource
+     */
+    public Resource getAntResource(Project p) {
+        Resource res = null;
+        switch (type) {
+            case URL:
+                URLResource ures = new URLResource(uri);
+                res = ures;
+                break;
+            case GZIP:
+                GZipResource gres = new GZipResource(
+                        new org.apache.tools.ant.types.resources.FileResource(new File(uri)));
+                res = gres;
+                break;
+            case BZIP2:
+                BZip2Resource bres = new BZip2Resource(
+                        new org.apache.tools.ant.types.resources.FileResource(new File(uri)));
+                res = bres;
+                break;
+            default:
+                //Default is Type FILE
+                res = new org.apache.tools.ant.types.resources.FileResource(new File(uri));
+        }
+        res.setProject(p);
+        return res;
+    }
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/PatternElement.java
 ,0 → 1,31
+/*
+ *   Copyright 2011 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+/**
+ *
+ * @author brian
+ */
+@XmlType()
+public class PatternElement {
+    @XmlValue()
+    public String pattern;
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/ResourceInterface.java
 ,0 → 1,37
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Resource;
+/**
+ * Wrapper for a single file like Ant Resources.
+ *
+ * @author Brian Rosenberger, bru@brutex.de
+ */
+public interface ResourceInterface {
+    /**
+     * Get this resource as Ant Resource.
+     *
+     * @param p     Ant project
+     * @return      this resource as Ant Resource
+     */
+    Resource getAntResource(Project p);
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/ArchiveResource.java
 ,0 → 1,123
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import java.io.File;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+import net.brutex.xservices.util.BrutexNamespaces;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.resources.TarResource;
+import org.apache.tools.ant.types.resources.ZipResource;
+import org.apache.tools.tar.TarEntry;
+import org.apache.tools.zip.ZipEntry;
+/**
+ * Resource from archive declaration.
+ *
+ * Defines a resource within an archive.
+ * @author Brian Rosenberger, bru@brutex.de
+ */
+@XmlType(namespace = BrutexNamespaces.WS_XSERVICES, name="ArchiveResourceType")
+public class ArchiveResource
+        implements ResourceInterface {
+    /**
+     * Archive Type.
+     */
+    @XmlElement(defaultValue = "ZIP", nillable = false, required = true)
+    public ArchiveType type = ArchiveType.ZIP;
+    /**
+     * Archive file.
+     *
+     * Path and filename of the archive to use.
+     */
+    @XmlElement(nillable = false, required = true)
+    public String archive;
+    /**
+     * URI within the archive.
+     *
+     * This is usually a filename or a path/filename combination. Relative paths
+     * are based from the archive root. It depends on how the archive has been
+     * created whether or not it is possible to use relative paths, absolute
+     * paths are required otherwise. Uses "/" as separator.
+     */
+    @XmlElement(nillable = false, required = true)
+    public String uri;
+    /**
+     * Supported archive types.
+     */
+    @XmlEnum(value=String.class)
+    public enum ArchiveType {
+        /**
+         * Zip archive type.
+         */
+        ZIP,
+        /**
+         * Tar archive type, without compression
+         */
+        TAR,
+        /**
+         * Tar archive type, with GZIP compression
+         */
+        GZTAR
+    }
+    /**
+     * Get Apache Ant Resource Type.
+     *
+     * @param p     Ant project
+     * @return      this ArchiveResource as Ant Resource
+     */
+    public Resource getAntResource(Project p) {
+        Resource res = null;
+        switch (type) {
+            case TAR:
+                TarEntry tarentry = new TarEntry(uri);
+                TarResource tres = new TarResource(new File(archive), tarentry);
+                res = tres;
+                break;
+            case GZTAR:
+                TarResource gres = new TarResource(new org.apache.tools.ant.types.resources.GZipResource(
+                        new org.apache.tools.ant.types.resources.FileResource(
+                        new File(archive))), new TarEntry(uri));
+                res = gres;
+                break;
+            default: //This is type ZIP also
+                ZipEntry zipentry = new ZipEntry(uri);
+                if (zipentry.getTime() == -1) {
+                    zipentry.setTime(System.currentTimeMillis());
+                }
+                res = new ZipResource(new File(archive), null, zipentry);
+                break;
+        }
+        res.setProject(p);
+        return res;
+    }
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/AttachmentType.java
 ,0 → 1,69
+/*
+ *   Copyright 2011 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import java.io.File;
+import java.io.IOException;
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+import net.brutex.xservices.util.BrutexNamespaces;
+import org.apache.cxf.aegis.type.java5.XmlElement;
+import org.apache.cxf.aegis.type.java5.XmlType;
+/**
+ * Represents a single file based attachment type.
+ * @author Brian Rosenberger, bru@brutex.de
+ * @since 0.4.0
+ */
+@XmlType(name=AttachmentType.XML_NAME, namespace=BrutexNamespaces.WS_XSERVICES)
+public class AttachmentType {
+        public static final String XML_NAME="attachment";
+        private DataHandler content;
+        private String filename = null;
+        @XmlMimeType("application/octet-stream")
+        @XmlElement(minOccurs="1")
+        public void setContent(DataHandler content) {
+                this.content = content;
+        }
+        public DataHandler getContent() {
+                return content;
+        }
+        public String getFilename() {
+                if(filename==null || filename.equals("")) {
+                        try {
+                                filename = File.createTempFile("XServices_", ".tmp").getPath();
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+                return filename;
+        }
+        public void setFilename(String filename) {
+                this.filename = filename;
+        }
+}
 Property changes:
 Added: svn:mime-type
 +text/plain
 \ No newline at end of property

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/PatternSetType.java
 ,0 → 1,41
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+/**
+ *
+ * @author Brian Rosenberger
+ */
+public class PatternSetType {
+    public static final String XML_NAME = "filter";
+    @XmlElement(required=false, nillable=false, defaultValue="**/*")
+    public List<PatternElement> include;
+    @XmlElement(required=false, nillable=false)
+    public List<PatternElement> exclude;
+    @XmlElement(required=false, nillable=true)
+    public SelectorType selector;
+    public PatternSetType() {
+    }
+}

 /xservices/trunk/src/java/net/brutex/xservices/types/ant/CollectionType.java
 ,0 → 1,84
+/*
+ *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package net.brutex.xservices.types.ant;
+import java.util.UUID;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+/**
+ * Defines a collection of storable objects.
+ *
+ * @author Brian Rosenberger
+ * @since 1.0
+ */
+@XmlType()
+public class CollectionType {
+        private String name="";
+        final private UUID uuid;
+        /**
+         * @return the name
+         */
+        public String getName() {
+                return name;
+        }
+        /**
+         * @param name the name to set
+         */
+        @XmlElement(required=true)
+        public void setName(String name) {
+                this.name = name;
+        }
+        /**
+         * @return
+         */
+        public String getUuid() {
+                return uuid.toString();
+        }
+        /**
+         * @param name
+         * @param uuid
+         */
+        public CollectionType(String name, UUID uuid) {
+                this.name = name;
+                this.uuid = uuid;
+        }
+        /**
+         * @param name
+         * @param uuid
+         */
+        public CollectionType(String name) {
+                this.name = name;
+                this.uuid = UUID.randomUUID();
+        }
+        /**
+         */
+        public CollectionType() {
+                this.name = "";
+                this.uuid = UUID.randomUUID();
+        }
+}
 Property changes:
 Added: svn:mime-type
 +text/plain
 \ No newline at end of property

 /xservices/trunk/src/java/net/brutex/xservices/types/ReturnCode.java
 ,6 → 19,8
 import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
+import net.brutex.xservices.types.ant.AntProperty;
 import net.brutex.xservices.util.BrutexNamespaces;
 /**

 /xservices/trunk/src/java/net/brutex/xservices/types/TargetNodeType.java
 ,7 → 19,9
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
+import net.brutex.xservices.util.BrutexNamespaces;
 /**
  * Defines target nodes.
  *
 ,9 → 28,10
  * @author Brian Rosenberger
  * @since 1.0
  */
-@XmlType()
+@XmlType(name=TargetNodeType.XML_NAME, namespace=BrutexNamespaces.WS_XSERVICES)
 public class TargetNodeType {
+        public static final String XML_NAME = "targetnode";
         private String name="";
 ,6 → 50,9
                 this.name = name;
         }
+        /**
+         *
+         */
         public TargetNodeType() {
         }

Subversion Repositories XServices

Compare Revisions

Ignore whitespace Rev 81 → Rev 82