[Swift-commit] cog r3917

swift at ci.uchicago.edu swift at ci.uchicago.edu
Tue Jun 10 01:00:16 CDT 2014


------------------------------------------------------------------------
r3917 | hategan | 2014-06-10 00:58:48 -0500 (Tue, 10 Jun 2014) | 1 line

removed WS provider
------------------------------------------------------------------------
Index: modules/provider-ws/project.properties
===================================================================
--- modules/provider-ws/project.properties	(revision 3916)
+++ modules/provider-ws/project.properties	(working copy)
@@ -1,7 +0,0 @@
-module.name 		= provider-ws
-long.name 		= Generic Web services provider for abstractions
-version			= 0.1
-project			= Java CoG Kit
-lib.deps		= wsif.jar, wsdl4j.jar
-debug			= true
-
Index: modules/provider-ws/launchers.xml
===================================================================
--- modules/provider-ws/launchers.xml	(revision 3916)
+++ modules/provider-ws/launchers.xml	(working copy)
@@ -1,6 +0,0 @@
-<project name="Launchers" default="create" basedir=".">
-  <target name="create">
-  </target>
-  <target name="webstart">
-   </target>
-</project>
Index: modules/provider-ws/dependencies.xml
===================================================================
--- modules/provider-ws/dependencies.xml	(revision 3916)
+++ modules/provider-ws/dependencies.xml	(working copy)
@@ -1,8 +0,0 @@
-<project name="Project dependencies" default="deps" basedir=".">
-	<!-- project dependencies -->
-	<target name="deps">
-		<ant antfile="${main.buildfile}" target="dep">
-			<property name="module" value="abstraction-common"/>
-		</ant>
-	</target>
-</project>
Index: modules/provider-ws/lib/wsdl4j.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: modules/provider-ws/lib/wsif.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: modules/provider-ws/meta/description.txt
===================================================================
--- modules/provider-ws/meta/description.txt	(revision 3916)
+++ modules/provider-ws/meta/description.txt	(working copy)
@@ -1,4 +0,0 @@
-The provider-ws module is a component of the abstractions framework.
-It provides the implementation for the execution task handler
-supporting invocations of generic Web services using the Web services 
-invication framework (WSIF). 
Index: modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/InvocationThread.java
===================================================================
--- modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/InvocationThread.java	(revision 3916)
+++ modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/InvocationThread.java	(working copy)
@@ -1,270 +0,0 @@
-// ----------------------------------------------------------------------
-//This code is developed as part of the Java CoG Kit project
-//The terms of the license can be found at http://www.cogkit.org/license
-//This message may not be removed or altered.
-//----------------------------------------------------------------------
-
-package org.globus.cog.abstraction.impl.invocation.ws;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.apache.log4j.Logger;
-import org.apache.wsif.WSIFException;
-import org.apache.wsif.WSIFMessage;
-import org.apache.wsif.WSIFOperation;
-import org.apache.wsif.WSIFPort;
-import org.apache.wsif.WSIFService;
-import org.apache.wsif.WSIFServiceFactory;
-import org.apache.wsif.util.WSIFUtils;
-import org.globus.cog.abstraction.impl.common.StatusImpl;
-import org.globus.cog.abstraction.interfaces.Status;
-import org.globus.cog.abstraction.interfaces.Task;
-import org.globus.cog.abstraction.interfaces.WSInvocationSpecification;
-
-public class InvocationThread extends Thread {
-    static Logger logger = Logger.getLogger(InvocationThread.class.getName());
-    private Task task = null;
-
-    public InvocationThread(Task task) {
-        this.task = task;
-    }
-
-    public void run() {
-        try {
-            this.task.setStatus(Status.ACTIVE);
-            org.globus.cog.abstraction.interfaces.Service service = this.task
-                    .getService(0);
-            WSInvocationSpecification spec = (WSInvocationSpecification) this.task
-                    .getSpecification();
-            String method = spec.getMethod();
-            String args[] = spec.getArgumentsAsArray();
-            HashMap map = invokeMethod(service.getServiceContact().getContact()
-                    + "?wsdl", method, null, null, null, "", args, 0);
-            String output = null;
-            for (Iterator iterator = map.keySet().iterator(); iterator
-                    .hasNext();) {
-                String name = (String) iterator.next();
-                if (output == null) {
-                    output = map.get(name) + "\n";
-                } else {
-                    output += map.get(name) + "\n";
-                }
-            }
-            this.task.setStdOutput(output);
-            this.task.setStatus(Status.COMPLETED);
-        } catch (Exception e) {
-            Status newStatus = new StatusImpl();
-            Status oldStatus = this.task.getStatus();
-            newStatus.setPrevStatusCode(oldStatus.getStatusCode());
-            newStatus.setStatusCode(Status.FAILED);
-            newStatus.setException(e);
-            this.task.setStatus(newStatus);
-        }
-    }
-
-    private HashMap invokeMethod(String wsdlLocation, String operationName,
-            String inputName, String outputName, String portName,
-            String protocol, String[] args, int argShift) throws Exception {
-        String serviceNS = null;
-        String serviceName = null;
-        String portTypeNS = null;
-        String portTypeName = null;
-
-        logger.debug("Reading WSDL document from '" + wsdlLocation + "'");
-        Definition def = WSIFUtils.readWSDL(null, wsdlLocation);
-
-        Service service = WSIFUtils.selectService(def, serviceNS, serviceName);
-
-        Map portTypes = WSIFUtils.getAllItems(def, "PortType");
-        if (portTypes.size() > 1 && portName != null) {
-            for (Iterator i = portTypes.keySet().iterator(); i.hasNext();) {
-                QName qn = (QName) i.next();
-                if (portName.equals(qn.getLocalPart())) {
-                    portTypeName = qn.getLocalPart();
-                    portTypeNS = qn.getNamespaceURI();
-                    break;
-                }
-            }
-        }
-        PortType portType = WSIFUtils.selectPortType(def, portTypeNS,
-                portTypeName);
-
-        WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
-        WSIFService dpf = factory.getService(def, service, portType);
-        WSIFPort port = null;
-        if (portName == null)
-            port = dpf.getPort();
-        else
-            port = dpf.getPort(portName);
-
-        if (inputName == null && outputName == null) {
-            // retrieve list of operations
-            List operationList = portType.getOperations();
-
-            // try to find input and output names for the operation specified
-            boolean found = false;
-            for (Iterator i = operationList.iterator(); i.hasNext();) {
-                Operation op = (Operation) i.next();
-                String name = op.getName();
-                if (!name.equals(operationName)) {
-                    continue;
-                }
-                if (found) {
-                    throw new RuntimeException(
-                            "Operation '"
-                                    + operationName
-                                    + "' is overloaded. "
-                                    + "Please specify the operation in the form "
-                                    + "'operationName:inputMessageName:outputMesssageName' to distinguish it");
-                }
-                found = true;
-                Input opInput = op.getInput();
-                inputName = (opInput.getName() == null) ? null : opInput
-                        .getName();
-                Output opOutput = op.getOutput();
-                outputName = (opOutput.getName() == null) ? null : opOutput
-                        .getName();
-            }
-        }
-
-        WSIFOperation operation = port.createOperation(operationName,
-                inputName, outputName);
-        WSIFMessage input = operation.createInputMessage();
-        WSIFMessage output = operation.createOutputMessage();
-        WSIFMessage fault = operation.createFaultMessage();
-
-        // retrieve list of names and types for input and names for output
-        List operationList = portType.getOperations();
-
-        // find portType operation to prepare in/out message w/ parts
-        boolean found = false;
-        String[] outNames = new String[0];
-        Class[] outTypes = new Class[0];
-        for (Iterator i = operationList.iterator(); i.hasNext();) {
-            Operation op = (Operation) i.next();
-            String name = op.getName();
-            if (!name.equals(operationName)) {
-                continue;
-            }
-            if (found) {
-                throw new RuntimeException(
-                        "overloaded operations are not supported");
-            }
-            found = true;
-            Input opInput = op.getInput();
-            String[] inNames = new String[0];
-            Class[] inTypes = new Class[0];
-            if (opInput != null) {
-                List parts = opInput.getMessage().getOrderedParts(null);
-                unWrapIfWrappedDocLit(parts, name, def);
-                int count = parts.size();
-                inNames = new String[count];
-                inTypes = new Class[count];
-                retrieveSignature(parts, inNames, inTypes);
-            }
-            for (int pos = 0; pos < inNames.length; ++pos) {
-                String arg = args[pos + argShift];
-                Object value = null;
-                Class c = inTypes[pos];
-                if (c.equals(String.class)) {
-                    value = arg;
-                } else if (c.equals(Double.TYPE)) {
-                    value = new Double(arg);
-                } else if (c.equals(Float.TYPE)) {
-                    value = new Float(arg);
-                } else if (c.equals(Integer.TYPE)) {
-                    value = new Integer(arg);
-                } else if (c.equals(Boolean.TYPE)) {
-                    value = new Boolean(arg);
-                } else {
-                    throw new RuntimeException("Cannot convert '" + arg
-                            + "' to " + c);
-                }
-
-                input.setObjectPart(inNames[pos], value);
-            }
-
-            Output opOutput = op.getOutput();
-            if (opOutput != null) {
-                List parts = opOutput.getMessage().getOrderedParts(null);
-                unWrapIfWrappedDocLit(parts, name + "Response", def);
-                int count = parts.size();
-                outNames = new String[count];
-                outTypes = new Class[count];
-                retrieveSignature(parts, outNames, outTypes);
-            }
-
-        }
-        if (!found) {
-            throw new RuntimeException("no operation " + operationName
-                    + " was found in port type " + portType.getQName());
-        }
-
-        logger.debug("Executing operation " + operationName);
-        operation.executeRequestResponseOperation(input, output, fault);
-
-        HashMap map = new HashMap();
-        for (int pos = 0; pos < outNames.length; ++pos) {
-            String name = outNames[pos];
-            map.put(name, output.getObjectPart(name));
-        }
-
-        return map;
-    }
-
-    private void retrieveSignature(List parts, String[] names, Class[] types) {
-        // get parts in correct order
-        for (int i = 0; i < names.length; ++i) {
-            Part part = (Part) parts.get(i);
-            names[i] = part.getName();
-            QName partType = part.getTypeName();
-            if (partType == null) {
-                partType = part.getElementName();
-            }
-            if (partType == null) {
-                throw new RuntimeException("part " + names[i]
-                        + " must have type name declared");
-            }
-            // only limited number of types is supported
-            // cheerfully ignoring schema namespace ...
-            String s = partType.getLocalPart();
-            if ("string".equals(s)) {
-                types[i] = String.class;
-            } else if ("double".equals(s)) {
-                types[i] = Integer.TYPE;
-            } else if ("float".equals(s)) {
-                types[i] = Float.TYPE;
-            } else if ("int".equals(s)) {
-                types[i] = Integer.TYPE;
-            } else if ("boolean".equals(s)) {
-                types[i] = Boolean.TYPE;
-            } else {
-                throw new RuntimeException("part type " + partType
-                        + " not supported in this sample");
-            }
-        }
-    }
-
-    private void unWrapIfWrappedDocLit(List parts, String operationName,
-            Definition def) throws WSIFException {
-        Part p = WSIFUtils.getWrappedDocLiteralPart(parts, operationName);
-        if (p != null) {
-            List unWrappedParts = WSIFUtils.unWrapPart(p, def);
-            parts.remove(p);
-            parts.addAll(unWrappedParts);
-        }
-    }
-
-}
\ No newline at end of file
Index: modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/TaskHandlerImpl.java
===================================================================
--- modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/TaskHandlerImpl.java	(revision 3916)
+++ modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/TaskHandlerImpl.java	(working copy)
@@ -1,247 +0,0 @@
-// ----------------------------------------------------------------------
-// This code is developed as part of the Java CoG Kit project
-// The terms of the license can be found at http://www.cogkit.org/license
-// This message may not be removed or altered.
-// ----------------------------------------------------------------------
-
-package org.globus.cog.abstraction.impl.invocation.ws;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.globus.cog.abstraction.impl.common.StatusEvent;
-import org.globus.cog.abstraction.impl.common.task.ActiveTaskException;
-import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
-import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
-import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
-import org.globus.cog.abstraction.impl.common.task.TaskSubmissionException;
-import org.globus.cog.abstraction.interfaces.DelegatedTaskHandler;
-import org.globus.cog.abstraction.interfaces.Status;
-import org.globus.cog.abstraction.interfaces.StatusListener;
-import org.globus.cog.abstraction.interfaces.Task;
-import org.globus.cog.abstraction.interfaces.TaskHandler;
-
-/**
- * Provides generic <code>TaskHandler</code> s for job submission task.
- */
-public class TaskHandlerImpl implements TaskHandler, StatusListener {
-    private Vector submittedList = null;
-    private Vector activeList = null;
-    private Vector suspendedList = null;
-    private Vector resumedList = null;
-    private Vector failedList = null;
-    private Vector canceledList = null;
-    private Vector completedList = null;
-    private Hashtable handleMap = null;
-    private int type;
-
-    public TaskHandlerImpl() {
-        this.submittedList = new Vector();
-        this.activeList = new Vector();
-        this.suspendedList = new Vector();
-        this.resumedList = new Vector();
-        this.failedList = new Vector();
-        this.canceledList = new Vector();
-        this.completedList = new Vector();
-        this.handleMap = new Hashtable();
-        this.type = TaskHandler.EXECUTION;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public int getType() {
-        return this.type;
-    }
-
-    public void submit(Task task) throws IllegalSpecException,
-            InvalidSecurityContextException, InvalidServiceContactException,
-            TaskSubmissionException {
-        if (task.getStatus().getStatusCode() != Status.UNSUBMITTED) {
-            throw new TaskSubmissionException(
-                    "TaskHandler can only handle unsubmitted tasks");
-        }
-        if (task.getType() != Task.WS_INVOCATION) {
-            throw new TaskSubmissionException(
-                    getName()
-                            + " execution task handler can only handle WS invocation tasks");
-        }
-        int type = task.getType();
-        DelegatedTaskHandler dth = newDelegatedTaskHandler();
-        task.addStatusListener(this);
-        this.handleMap.put(task, dth);
-        dth.submit(task);
-    }
-
-    protected DelegatedTaskHandler newDelegatedTaskHandler() {
-        return new InvocationTaskHandler();
-    }
-
-    protected String getName() {
-        return "Invocation";
-    }
-
-    public void suspend(Task task) throws InvalidSecurityContextException,
-            TaskSubmissionException {
-        DelegatedTaskHandler dth = (DelegatedTaskHandler) this.handleMap
-                .get(task);
-        if (dth != null) {
-            dth.suspend();
-        }
-    }
-
-    public void resume(Task task) throws InvalidSecurityContextException,
-            TaskSubmissionException {
-        DelegatedTaskHandler dth = (DelegatedTaskHandler) this.handleMap
-                .get(task);
-        if (dth != null) {
-            dth.resume();
-        }
-    }
-
-    public void cancel(Task task) throws InvalidSecurityContextException,
-            TaskSubmissionException {
-        DelegatedTaskHandler dth = (DelegatedTaskHandler) this.handleMap
-                .get(task);
-        if (dth != null) {
-            dth.cancel();
-        } else {
-            task.setStatus(Status.CANCELED);
-        }
-    }
-
-    public void remove(Task task) throws ActiveTaskException {
-        if (!handleMap.containsKey(task)) {
-            return;
-        }
-        int status = task.getStatus().getStatusCode();
-        if ((status == Status.ACTIVE)) {
-            throw new ActiveTaskException(
-                    "Cannot remove an active or suspended Task");
-        } else {
-            // might cause problems
-            // task.removeStatusListener(this);
-            this.failedList.remove(task);
-            this.canceledList.remove(task);
-            this.completedList.remove(task);
-            this.suspendedList.remove(task);
-            this.submittedList.remove(task);
-            this.handleMap.remove(task);
-
-            /*
-             * this is required because statusChange listeners are invoked in a
-             * single thread So if one listener that wants to remove a task from
-             * the handler is invoked before the listener implemented by this
-             * object, the task will be be in the activeList and will not be
-             * actually removed.
-             * 
-             * To solve this we remove tasks from active list too
-             */
-            this.activeList.remove(task);
-        }
-    }
-
-    /** return a collection of all tasks submitted to the handler */
-    public Collection getAllTasks() {
-        try {
-            return new ArrayList(handleMap.keySet());
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /** return a collection of active tasks */
-    public Collection getActiveTasks() {
-        return new ArrayList(this.activeList);
-    }
-
-    /** return a collection of failed tasks */
-    public Collection getFailedTasks() {
-        return new ArrayList(this.failedList);
-    }
-
-    /** return a collection of completed tasks */
-    public Collection getCompletedTasks() {
-        return new ArrayList(this.completedList);
-    }
-
-    /** return a collection of suspended tasks */
-    public Collection getSuspendedTasks() {
-        return new ArrayList(this.suspendedList);
-    }
-
-    /** return a collection of resumed tasks */
-    public Collection getResumedTasks() {
-        return new ArrayList(this.resumedList);
-    }
-
-    /** return a collection of canceled tasks */
-    public Collection getCanceledTasks() {
-        return new ArrayList(this.canceledList);
-    }
-
-    public void statusChanged(StatusEvent event) {
-        Task task = (Task) event.getSource();
-        Status status = event.getStatus();
-        int prevStatus = status.getPrevStatusCode();
-        int curStatus = status.getStatusCode();
-        switch (prevStatus) {
-        case Status.SUBMITTED:
-            this.submittedList.remove(task);
-            break;
-        case Status.ACTIVE:
-            this.activeList.remove(task);
-            break;
-        case Status.SUSPENDED:
-            this.suspendedList.remove(task);
-            break;
-        case Status.RESUMED:
-            this.resumedList.remove(task);
-            break;
-        case Status.FAILED:
-            this.failedList.remove(task);
-            break;
-        case Status.CANCELED:
-            this.canceledList.remove(task);
-            break;
-        case Status.COMPLETED:
-            this.completedList.remove(task);
-            break;
-        default:
-            break;
-        }
-        if (task != null) {
-            switch (curStatus) {
-            case Status.SUBMITTED:
-                this.submittedList.add(task);
-                break;
-            case Status.ACTIVE:
-                this.activeList.add(task);
-                break;
-            case Status.SUSPENDED:
-                this.suspendedList.add(task);
-                break;
-            case Status.RESUMED:
-                this.resumedList.add(task);
-                break;
-            case Status.FAILED:
-                this.failedList.add(task);
-                this.handleMap.remove(task);
-                break;
-            case Status.CANCELED:
-                this.canceledList.add(task);
-                this.handleMap.remove(task);
-                break;
-            case Status.COMPLETED:
-                this.completedList.add(task);
-                this.handleMap.remove(task);
-                break;
-            default:
-                break;
-            }
-        }
-    }
-}
\ No newline at end of file
Index: modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/InvocationTaskHandler.java
===================================================================
--- modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/InvocationTaskHandler.java	(revision 3916)
+++ modules/provider-ws/src/org/globus/cog/abstraction/impl/invocation/ws/InvocationTaskHandler.java	(working copy)
@@ -1,67 +0,0 @@
-// ----------------------------------------------------------------------
-//This code is developed as part of the Java CoG Kit project
-//The terms of the license can be found at http://www.cogkit.org/license
-//This message may not be removed or altered.
-//----------------------------------------------------------------------
-
-package org.globus.cog.abstraction.impl.invocation.ws;
-
-import org.apache.log4j.Logger;
-import org.globus.cog.abstraction.impl.common.StatusImpl;
-import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
-import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
-import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
-import org.globus.cog.abstraction.impl.common.task.TaskSubmissionException;
-import org.globus.cog.abstraction.interfaces.DelegatedTaskHandler;
-import org.globus.cog.abstraction.interfaces.Status;
-import org.globus.cog.abstraction.interfaces.Task;
-
-public class InvocationTaskHandler implements DelegatedTaskHandler {
-    private static Logger logger = Logger
-            .getLogger(InvocationTaskHandler.class);
-
-    private Task task = null;
-
-    public void submit(Task task) throws IllegalSpecException,
-            InvalidSecurityContextException, InvalidServiceContactException,
-            TaskSubmissionException {
-        if (this.task != null) {
-            throw new TaskSubmissionException(
-                    "InvocationTaskHandler cannot handle two active tasks simultaneously");
-        } else {
-            this.task = task;
-            InvocationThread thread = new InvocationThread(this.task);
-            try {
-                // check if the task has not been canceled after it was
-                // submitted for execution
-                if (this.task.getStatus().getStatusCode() == Status.UNSUBMITTED) {
-                    this.task.setStatus(Status.SUBMITTED);
-                    thread.start();
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                Status newStatus = new StatusImpl();
-                Status oldStatus = this.task.getStatus();
-                newStatus.setPrevStatusCode(oldStatus.getStatusCode());
-                newStatus.setStatusCode(Status.FAILED);
-                newStatus.setException(e);
-                this.task.setStatus(newStatus);
-            }
-
-        }
-    }
-
-    public void suspend() throws InvalidSecurityContextException,
-            TaskSubmissionException {
-    }
-
-    public void resume() throws InvalidSecurityContextException,
-            TaskSubmissionException {
-    }
-
-    public void cancel() throws InvalidSecurityContextException,
-            TaskSubmissionException {
-
-        this.task.setStatus(Status.CANCELED);
-    }
-}
\ No newline at end of file
Index: modules/provider-ws/resources/cog-provider.properties
===================================================================
--- modules/provider-ws/resources/cog-provider.properties	(revision 3916)
+++ modules/provider-ws/resources/cog-provider.properties	(working copy)
@@ -1,5 +0,0 @@
-provider=ws
-sandbox=false
-executionTaskHandler=org.globus.cog.abstraction.impl.invocation.ws.TaskHandlerImpl
-securityContext=org.globus.cog.abstraction.impl.common.task.SecurityContextImpl
-
Index: modules/provider-ws/etc/MANIFEST.MF.tail
===================================================================
--- modules/provider-ws/etc/MANIFEST.MF.tail	(revision 3916)
+++ modules/provider-ws/etc/MANIFEST.MF.tail	(working copy)
@@ -1 +0,0 @@
-
Index: modules/provider-ws/etc/MANIFEST.MF.head
===================================================================
--- modules/provider-ws/etc/MANIFEST.MF.head	(revision 3916)
+++ modules/provider-ws/etc/MANIFEST.MF.head	(working copy)
@@ -1 +0,0 @@
-Manifest-Version: 1.0
Index: modules/provider-ws/build.xml
===================================================================
--- modules/provider-ws/build.xml	(revision 3916)
+++ modules/provider-ws/build.xml	(working copy)
@@ -1,152 +0,0 @@
-<project name="Java CoG Kit" default="dist" basedir=".">
-
-	<property file="project.properties"/>
-	<property name="cog.dir"		value="${basedir}/../../"/>
-	<property name="main.buildfile"	value="${cog.dir}/mbuild.xml"/>
-	<property name="dist.dir" 		value="${cog.dir}/modules/${module.name}/dist/${module.name}-${version}"/>
-	<property name="build.dir" 		value="${cog.dir}/modules/${module.name}/build"/>
-
-    <!--  _________________________________________________________________  -->
-    <!-- /                                                                 \ -->
-    <!-- | Help                                                            | -->
-    <!-- \_________________________________________________________________/ -->
-	
-    <target name="help">
-        <echo>
-			Available targets:
-            	help:
-					prints out this help message
-					
-            	dist:
-					creates a distribution directory of the 
-					${project} ${long.name}
-					
-            	jar:
-					creates a jar file for the ${project} ${long.name}
-					named ${jar.filename}
-					
-            	javadoc:
-					creates the documentation
-					
-            	clean:
-					removes the compiled classes
-					
-            	distclean:
-					deletes the distribution directory
-
-				all:
-					dist and javadoc
-					
-				deploy.webstart:
-					deploys the module as a webstart application
-					
-				dist.joint:
-					builds everything into one jar file. Should only
-					be used globally (from all)
-
-                 fixeol:
-                                        change newlines to the unix standard  
-        </echo>
-    </target>
-
-
-	<!--  _________________________________________________________________  -->
-    <!-- /                                                                 \ -->
-    <!-- | Dist                                                            | -->
-    <!-- \_________________________________________________________________/ -->
-	
-	<target name="dist" unless="no.providers">
-		<ant antfile="${main.buildfile}" target="dist"/>
-	</target>
-
-
-	<!--  _________________________________________________________________  -->
-    <!-- /                                                                 \ -->
-    <!-- | Compile                                                         | -->
-    <!-- \_________________________________________________________________/ -->
-	
-	<target name="compile">
-		<ant antfile="${main.buildfile}" target="compile"/>
-	</target>
-
-	<!--  _________________________________________________________________  -->
-    <!-- /                                                                 \ -->
-    <!-- | Clean                                                           | -->
-    <!-- \_________________________________________________________________/ -->
-	
-	<target name="clean">
-		<ant antfile="${main.buildfile}" target="clean"/>
-	</target>
-
-
-	<!--  _________________________________________________________________  -->
-    <!-- /                                                                 \ -->
-    <!-- | Distclean                                                       | -->
-    <!-- \_________________________________________________________________/ -->
-	
-	<target name="distclean">
-		<ant antfile="${main.buildfile}" target="distclean"/>
-	</target>
-
-
-    <!--  _________________________________________________________________  -->
-    <!-- /                                                                 \ -->
-    <!-- | Jar                                                             | -->
-    <!-- \_________________________________________________________________/ -->
-
-	<target name="jar">
-		<ant antfile="${main.buildfile}" target="jar"/>
-	</target>
-
-
-    <!--  _________________________________________________________________  -->
-    <!-- /                                                                 \ -->
-    <!-- | Javadoc                                                         | -->
-    <!-- \_________________________________________________________________/ -->
-
-	<target name="javadoc">
-		<ant antfile="${main.buildfile}" target="javadoc"/>
-	</target>
-
-
-
-	<!--  _________________________________________________________________  -->
-    <!-- /                                                                 \ -->
-    <!-- | PMD                                                             | -->
-    <!-- \_________________________________________________________________/ -->
-
-	<target name="pmd">
-		<ant antfile="${main.buildfile}" target="pmd"/>
-	</target>
-	
-	<target name="deploy.webstart">
-		<ant antfile="${main.buildfile}" target="deploy.webstart"/>
-	</target>
-
-	<target name="replacelibs">
-		<ant antfile="${main.buildfile}" target="replacelibs"/>
-	</target>
-	
-	<target name="webstart.launchers">
-		<ant antfile="${main.buildfile}" target="webstart.launchers"/>
-	</target>
-	
-	<target name="dist.joint">
-		<ant antfile="${main.buildfile}" target="dist.all"/>
-	</target>
-
-	<target name="module.package">
-		<ant antfile="${main.buildfile}" target="module.package"/>
-	</target>
-
-    <!-- ================================================ -->
-    <!-- fixeol                                           -->
-    <!-- ================================================ -->
-
-	<target name="fixeol">
-		<ant antfile="${main.buildfile}" target="fixeol"/>
-	</target>
-
-</project>
-
-



More information about the Swift-commit mailing list