http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Credential.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Credential.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Credential.java deleted file mode 100644 index c6627da..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Credential.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static org.taverna.server.master.common.Namespaces.XLINK; - -import java.io.Serializable; -import java.net.URI; -import java.security.Key; -import java.security.cert.Certificate; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -import javax.annotation.Nonnull; - -/** - * A description of a private credential. This description is characterised by a - * file visible to the workflow run that contains a particular key-pair. - * - * @author Donal Fellows - */ -@XmlType(name = "CredentialDescriptor") -@XmlSeeAlso({ Credential.KeyPair.class, Credential.Password.class }) -@SuppressWarnings("serial") -public abstract class Credential implements Serializable { - /** The location of this descriptor in the REST world. */ - @XmlAttribute(namespace = XLINK) - public String href; - /** - * The location of this descriptor in the SOAP world. Must match corrected - * with the {@link #href} field. - */ - @XmlTransient - public String id; - /** - * The service URI to use this credential with. If omitted, this represents - * the <i>default</i> credential to use. - */ - @XmlElement - @XmlSchemaType(name = "anyURI") - public URI serviceURI; - /** The key extracted from the keystore. */ - public transient Key loadedKey; - /** The trust chain of the key extracted from the keystore. */ - public transient Certificate[] loadedTrustChain; - - @Override - public int hashCode() { - return id.hashCode(); - } - - @Override - public final boolean equals(Object o) { - if (o == null || !(o instanceof Credential)) - return false; - return equals((Credential) o); - } - - protected boolean equals(@Nonnull Credential c) { - return id.equals(c.id); - } - - /** - * A description of a credential that is a public/private key-pair in some - * kind of key store. - * - * @author Donal Fellows - */ - @XmlRootElement(name = "keypair") - @XmlType(name = "KeyPairCredential") - public static class KeyPair extends Credential { - /** The name of the credential within its store, i.e., it's alias. */ - @XmlElement(required = true) - public String credentialName; - /** - * The keystore file containing the credential. This is resolved with - * respect to the workflow run working directory. - */ - @XmlElement - public String credentialFile; - /** - * The type of keystore file. Defaults to <tt>JKS</tt> if unspecified. - */ - @XmlElement - public String fileType; - /** - * The password used to unlock the keystore file. It is assumed that the - * same password is used for unlocking the credential within, or that - * the inner password is empty. - */ - @XmlElement - public String unlockPassword; - /** - * The encoded serialized keystore containing the credential. - */ - @XmlElement - public byte[] credentialBytes; - - @Override - public String toString() { - return "keypair(id=" + id + ")"; - } - } - - /** - * A description of a credential that is a username and password. - * - * @author Donal Fellows - */ - @XmlRootElement(name = "userpass") - @XmlType(name = "PasswordCredential") - public static class Password extends Credential { - @XmlElement(required = true) - public String username; - @XmlElement(required = true) - public String password; - - @Override - public String toString() { - return "userpass(id=" + id + ")"; - } - } - - /** - * A credential that is just used for deleting credentials by ID. Cannot be - * marshalled as XML. - * - * @author Donal Fellows - */ - public static class Dummy extends Credential { - public Dummy(String id) { - this.id = id; - } - - @Override - public String toString() { - return "dummy(id=" + id + ")"; - } - } -} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/DirEntryReference.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/DirEntryReference.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/DirEntryReference.java deleted file mode 100644 index 424e32a..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/DirEntryReference.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static org.taverna.server.master.common.Namespaces.XLINK; - -import java.net.URI; - -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - -import org.taverna.server.master.interfaces.Directory; -import org.taverna.server.master.interfaces.DirectoryEntry; - -/** - * A reference to something that is in a directory below the working directory - * of a workflow run, described using JAXB. Note that when creating an XML - * document containing one of these in a client, it is <i>not</i> necessary to - * supply any attribute. - * - * @author Donal Fellows - */ -@XmlType(name = "DirectoryEntry") -@XmlSeeAlso( { DirEntryReference.DirectoryReference.class, - DirEntryReference.FileReference.class }) -public class DirEntryReference { - /** A link to the entry. Ignored on input. */ - @XmlAttribute(name = "href", namespace = XLINK) - @XmlSchemaType(name = "anyURI") - public URI link; - /** The last, user-displayable part of the name. Ignored on input. */ - @XmlAttribute - public String name; - /** The path of the entry. */ - @XmlValue - public String path; - - /** - * Return the directory entry reference instance subclass suitable for the - * given directory entry. - * - * @param entry - * The entry to characterise. - * @return An object that describes the directory entry. - */ - public static DirEntryReference newInstance(DirectoryEntry entry) { - return newInstance(null, entry); - } - - /** - * Return the directory entry reference instance subclass suitable for the - * given directory entry. - * - * @param ub - * Used for constructing URIs. The {@link #link} field is not - * filled in if this is <tt>null</tt>. - * @param entry - * The entry to characterise. - * @return An object that describes the directory entry. - */ - // Really returns a subclass, so cannot be constructor - public static DirEntryReference newInstance(UriBuilder ub, - DirectoryEntry entry) { - DirEntryReference de = (entry instanceof Directory) ? new DirectoryReference() - : new FileReference(); - de.name = entry.getName(); - String fullname = entry.getFullName(); - de.path = fullname.startsWith("/") ? fullname.substring(1) : fullname; - if (ub != null) - de.link = ub.build(entry.getName()); - return de; - } - - /** A reference to a directory, done with JAXB. */ - @XmlRootElement(name = "dir") - @XmlType(name = "DirectoryReference") - public static class DirectoryReference extends DirEntryReference { - } - - /** A reference to a file, done with JAXB. */ - @XmlRootElement(name = "file") - @XmlType(name = "FileReference") - public static class FileReference extends DirEntryReference { - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java deleted file mode 100644 index b1eb55c..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/InputDescription.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - -import org.taverna.server.master.interfaces.Input; -import org.taverna.server.master.interfaces.TavernaRun; - -/** - * A description of the inputs to a workflow, described using JAXB. - * - * @author Donal Fellows - */ -@XmlRootElement(name = "inputConfiguration") -@XmlType(name = "InputConfigurationDescription") -public class InputDescription extends VersionedElement { - /** - * The Baclava file handling the description of the elements. May be - * omitted/<tt>null</tt>. - */ - @XmlElement(required = false) - public String baclavaFile; - /** - * The port/value assignment. - */ - @XmlElement(nillable = false) - public List<Port> port = new ArrayList<>(); - - /** - * Make a blank input description. - */ - public InputDescription() { - } - - /** - * Make an input description suitable for the given workflow run. - * - * @param run - */ - public InputDescription(TavernaRun run) { - super(true); - baclavaFile = run.getInputBaclavaFile(); - if (baclavaFile == null) - for (Input i : run.getInputs()) - port.add(new Port(i)); - } - - /** - * The type of a single port description. - * - * @author Donal Fellows - */ - @XmlType(name = "PortConfigurationDescription") - public static class Port { - /** - * The name of this port. - */ - @XmlAttribute(name = "portName", required = true) - public String name; - /** - * The file assigned to this port. - */ - @XmlAttribute(name = "portFile", required = false) - public String file; - /** - * The file assigned to this port. - */ - @XmlAttribute(name = "listDelimiter", required = false) - public String delimiter; - /** - * The value assigned to this port. - */ - @XmlValue - public String value; - - /** - * Make a blank port description. - */ - public Port() { - } - - /** - * Make a port description suitable for the given input. - * - * @param input - */ - public Port(Input input) { - name = input.getName(); - if (input.getFile() != null) { - file = input.getFile(); - value = ""; - } else { - file = null; - value = input.getValue(); - } - delimiter = input.getDelimiter(); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Namespaces.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Namespaces.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Namespaces.java deleted file mode 100644 index d2035ee..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Namespaces.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -/** - * A convenient place to keep the names of URIs so that they can be got right - * <i>once</i>. - * - * @author Donal Fellows - */ -public interface Namespaces { - /** - * The XLink specification's namespace name. - */ - public static final String XLINK = "http://www.w3.org/1999/xlink";; - /** - * The XML Digital Signature specification's namespace name. - */ - public static final String XSIG = "http://www.w3.org/2000/09/xmldsig#";; - /** - * The Usage Record specification's namespace name. - */ - public static final String UR = "http://schema.ogf.org/urf/2003/09/urf";; - /** - * The T2flow document format's namespace name. - */ - public static final String T2FLOW = "http://taverna.sf.net/2008/xml/t2flow";; - /** - * The namespace for the server. - */ - public static final String SERVER = "http://ns.taverna.org.uk/2010/xml/server/";; - public static final String SERVER_REST = SERVER + "rest/"; - public static final String SERVER_SOAP = SERVER + "soap/"; - public static final String FEED = SERVER + "feed/"; - public static final String ADMIN = SERVER + "admin/"; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Permission.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Permission.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Permission.java deleted file mode 100644 index 3e0a307..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Permission.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; - -/** - * Description of a permission to access a particular workflow run. Note that - * users always have full access to their own runs, as does any user with the " - * <tt>{@value org.taverna.server.master.common.Roles#ADMIN}</tt>" ability. - * - * @author Donal Fellows - */ -@XmlType(name = "Permission") -@XmlEnum -public enum Permission { - /** Indicates that a user cannot see the workflow run at all. */ - @XmlEnumValue("none") - None, - /** - * Indicates that a user can see the workflow run and its contents, but - * can't modify anything. - */ - @XmlEnumValue("read") - Read, - /** - * Indicates that a user can update most aspects of a workflow, but cannot - * work with either its security features or its lifetime. - */ - @XmlEnumValue("update") - Update, - /** - * Indicates that a user can update almost all aspects of a workflow, with - * only its security features being shrouded. - */ - @XmlEnumValue("destroy") - Destroy -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/ProfileList.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/ProfileList.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/ProfileList.java deleted file mode 100644 index d9b0a9e..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/ProfileList.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - -/** - * Description of the profiles that can apply to a workflow. - * - * @author Donal K. Fellows - */ -@XmlRootElement(name = "profiles") -@XmlType(name = "ProfileList") -public class ProfileList { - public List<ProfileList.Info> profile = new ArrayList<ProfileList.Info>(); - - /** - * Description of a single workflow profile. - * - * @author Donal Fellows - */ - @XmlRootElement(name = "profile") - @XmlType(name = "Profile") - public static class Info { - @XmlValue - public String name; - /** - * Whether this is the main profile. - */ - @XmlAttribute(name = "isMain") - public Boolean main; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Roles.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Roles.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Roles.java deleted file mode 100644 index bdcf876..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Roles.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -/** - * The roles defined in this webapp. - * - * @author Donal Fellows - */ -public interface Roles { - /** The role of a normal user. */ - static final String USER = "ROLE_tavernauser"; - /** - * The role of an administrator. Administrators <i>should</i> have the - * normal user role as well. - */ - static final String ADMIN = "ROLE_tavernasuperuser"; - /** - * The role of a workflow accessing itself. Do not give users this role. - */ - static final String SELF = "ROLE_tavernaworkflow"; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/RunReference.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/RunReference.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/RunReference.java deleted file mode 100644 index cc80f60..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/RunReference.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static org.taverna.server.master.common.Namespaces.SERVER; -import static org.taverna.server.master.common.Namespaces.XLINK; -import static org.taverna.server.master.common.VersionedElement.VERSION; - -import java.net.URI; - -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - -/** - * A reference to a single workflow run, described using JAXB. - * - * @author Donal Fellows - * @see org.taverna.server.master.interfaces.TavernaRun TavernaRun - */ -@XmlRootElement -@XmlType(name = "TavernaRun") -@XmlSeeAlso( { Workflow.class, DirEntryReference.class }) -public class RunReference { - /** - * Where to get information about the run. For REST. - */ - @XmlAttribute(name = "href", namespace = XLINK) - @XmlSchemaType(name = "anyURI") - public URI link; - /** What version of server produced this element? */ - @XmlAttribute(namespace = SERVER) - public String serverVersion; - /** - * The name of the run. For SOAP. - */ - @XmlValue - public String name; - - /** - * Make a blank run reference. - */ - public RunReference() { - } - - /** - * Make a reference to the given workflow run. - * - * @param name - * The name of the run. - * @param ub - * A factory for URIs, or <tt>null</tt> if none is to be made. - */ - public RunReference(String name, UriBuilder ub) { - this.serverVersion = VERSION; - this.name = name; - if (ub != null) - this.link = ub.build(name); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Status.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Status.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Status.java deleted file mode 100644 index 1aad4ef..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Status.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; - -/** - * States of a workflow run. They are {@link #Initialized Initialized}, - * {@link #Operating Operating}, {@link #Stopped Stopped}, and {@link #Finished - * Finished}. Conceptually, there is also a <tt>Destroyed</tt> state, but the - * workflow run does not exist (and hence can't have its state queried or set) - * in that case. - * - * @author Donal Fellows - */ -@XmlEnum -@XmlType(name = "Status") -public enum Status { - /** - * The workflow run has been created, but is not yet running. The run will - * need to be manually moved to {@link #Operating Operating} when ready. - */ - Initialized, - /** - * The workflow run is going, reading input, generating output, etc. Will - * eventually either move automatically to {@link #Finished Finished} or can - * be moved manually to {@link #Stopped Stopped} (where supported). - */ - Operating, - /** - * The workflow run is paused, and will need to be moved back to - * {@link #Operating Operating} manually. - */ - Stopped, - /** - * The workflow run has ceased; data files will continue to exist until the - * run is destroyed (which may be manual or automatic). - */ - Finished -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Trust.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Trust.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Trust.java deleted file mode 100644 index c61e72a..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Trust.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static org.taverna.server.master.common.Namespaces.XLINK; - -import java.io.Serializable; -import java.security.cert.Certificate; -import java.util.Collection; -import java.util.List; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -/** - * A description of a trusted identity or identities. This description is - * characterised by a file visible to the workflow run that contains one or more - * certificates. - * - * @author Donal Fellows - */ -@XmlType(name = "TrustDescriptor") -@XmlRootElement(name = "trustedIdentity") -@SuppressWarnings("serial") -public final class Trust implements Serializable { - /** The location of this descriptor in the REST world. */ - @XmlAttribute(namespace = XLINK) - public String href; - /** - * The location of this descriptor in the SOAP world. Must match corrected - * with the {@link #href} field. - */ - @XmlTransient - public String id; - /** - * The file containing the certificate(s). This is resolved with respect to - * the workflow run working directory. - */ - @XmlElement - public String certificateFile; - /** - * The type of certificate file. Defaults to <tt>X.509</tt> if unspecified. - */ - @XmlElement - public String fileType; - /** - * The encoded serialized keystore containing the certificate(s). - */ - @XmlElement - public byte[] certificateBytes; - /** - * The names of the server(s) identified by this trust. - */ - @XmlElement - public List<String> serverName; - /** - * The collection of certificates loaded from the specified file. This is - * always <tt>null</tt> before validation. - */ - public transient Collection<? extends Certificate> loadedCertificates; - - @Override - public int hashCode() { - return id.hashCode(); - } - - @Override - public boolean equals(Object o) { - if (o == null || !(o instanceof Trust)) - return false; - return id.equals(((Trust) o).id); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Uri.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Uri.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Uri.java deleted file mode 100644 index ba0bb3c..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Uri.java +++ /dev/null @@ -1,445 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static javax.ws.rs.core.UriBuilder.fromUri; -import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.common.Namespaces.XLINK; - -import java.lang.reflect.Method; -import java.net.URI; -import java.util.Map; - -import javax.annotation.PreDestroy; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; -import javax.ws.rs.core.UriInfo; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - -import org.apache.commons.logging.Log; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.web.PortMapper; - -import javax.annotation.Nonnull; - -/** - * A class that makes it simpler to work with an element with a {@link URI} in - * an <tt>href</tt> attribute. Done with JAXB. - * - * @author Donal Fellows - */ -@XmlType(name = "Location") -public class Uri { - static Log log = getLog("Taverna.Server.UriRewriter"); - private static final String SECURE_SCHEME = "https"; - /** - * This type is characterised by an attribute that is the reference to some - * other element. - */ - @XmlAttribute(name = "href", namespace = XLINK) - @XmlSchemaType(name = "anyURI") - public URI ref; - - /** Make a reference that points nowhere. */ - public Uri() { - } - - /** - * Make a reference to the given location. - * - * @param ref - * Where to point to. - */ - public Uri(@Nonnull URI ref) { - this.ref = secure(ref); - } - - /** - * Make a reference from the factory with the given parameters. - * - * @param ub - * The configured factory. - * @param strings - * The parameters to the factory. - */ - public Uri(@Nonnull UriBuilder ub, String... strings) { - ref = secure(ub).build((Object[]) strings); - } - - /** - * Make a reference from the factory with the given parameters. - * - * @param ui - * The factory factory. - * @param path - * The path to configure the factory with. - * @param strings - * The parameters to the factory. - */ - public Uri(@Nonnull UriInfo ui, @Nonnull String path, String... strings) { - this(ui, true, path, strings); - } - - /** - * Make a reference from the factory with the given parameters. - * - * @param ui - * The factory factory. - * @param secure - * Whether the URI should be required to use HTTPS. - * @param path - * The path to configure the factory with. - * @param strings - * The parameters to the factory. - */ - public Uri(@Nonnull UriInfo ui, boolean secure, @Nonnull String path, - String... strings) { - UriBuilder ub = ui.getAbsolutePathBuilder(); - if (secure) { - ub = secure(ub); - } - ref = ub.path(path).build((Object[]) strings); - } - - public static UriBuilder secure(UriBuilder ub) { - return Rewriter.getInstance().getSecuredUriBuilder(ub); - } - - public static UriBuilder secure(UriInfo ui) { - return secure(ui.getAbsolutePathBuilder()); - } - - public static URI secure(URI uri) { - URI newURI = secure(fromUri(uri)).build(); - if (log.isDebugEnabled()) - log.debug("rewrote " + uri + " to " + newURI); - return newURI; - } - - public static URI secure(URI base, String uri) { - URI newURI = secure(fromUri(base.resolve(uri))).build(); - if (log.isDebugEnabled()) - log.debug("rewrote " + uri + " to " + newURI); - return newURI; - } - - /** - * A bean that allows configuration of how to rewrite generated URIs to be - * secure. - * - * @author Donal Fellows - */ - public static class Rewriter { - private static Rewriter instance; - private PortMapper portMapper; - private boolean suppress; - private String rewriteRE = "://[^/]+/[^/]+"; - private String rewriteTarget; - - static Rewriter getInstance() { - if (instance == null) - new Rewriter(); - return instance; - } - - @Autowired - public void setPortMapper(PortMapper portMapper) { - this.portMapper = portMapper; - } - - /** - * Whether to suppress rewriting of URIs to be secure. - * - * @param suppressSecurity - * True if no rewriting should be done. - */ - public void setSuppressSecurity(boolean suppressSecurity) { - suppress = suppressSecurity; - } - - public void setRewriteRegexp(String rewriteRegexp) { - this.rewriteRE = rewriteRegexp; - } - - /** - * What to rewrite the host, port and web-app name to be. - * - * @param rewriteTarget - * What to rewrite to, or "<tt>NONE</tt>" for no rewrite. - */ - public void setRewriteTarget(String rewriteTarget) { - if (rewriteTarget.isEmpty()) - this.rewriteTarget = null; - else if (rewriteTarget.equals("NONE")) - this.rewriteTarget = null; - else if (rewriteTarget.startsWith("${")) - this.rewriteTarget = null; - else - this.rewriteTarget = "://" + rewriteTarget; - } - - private Integer lookupHttpsPort(URI uri) { - if (portMapper != null) - return portMapper.lookupHttpsPort(uri.getPort()); - return null; - } - - public Rewriter() { - instance = this; - } - - @PreDestroy - public void done() { - instance = null; - Uri.log = null; - } - - @Nonnull - URI rewrite(@Nonnull String url) { - if (rewriteTarget != null) - url = url.replaceFirst(rewriteRE, rewriteTarget); - return URI.create(url); - } - - @Nonnull - public UriBuilder getSecuredUriBuilder(@Nonnull UriBuilder uribuilder) { - if (suppress) - return uribuilder.clone(); - UriBuilder ub = new RewritingUriBuilder(uribuilder); - Integer secPort = null; - try { - secPort = lookupHttpsPort(ub.build()); - } catch (Exception e) { - /* - * Do not log this; we know why it happens and don't actually - * care to do anything about it. All it does is fill up the log - * with pointless scariness! - */ - - // log.debug("failed to extract current URI port", e); - } - if (secPort == null || secPort.intValue() == -1) - return ub.scheme(SECURE_SCHEME); - return ub.scheme(SECURE_SCHEME).port(secPort); - } - - /** - * {@link UriBuilder} that applies a rewrite rule to the URIs produced - * by the wrapped builder. - * - * @author Donal Fellows - */ - class RewritingUriBuilder extends UriBuilder { - private UriBuilder wrapped; - - RewritingUriBuilder(UriBuilder builder) { - wrapped = builder.clone(); - } - - private URI rewrite(URI uri) { - return Rewriter.this.rewrite(uri.toString()); - } - - @Override - public UriBuilder clone() { - return new RewritingUriBuilder(wrapped); - } - - @Override - public URI buildFromMap(Map<String, ?> values) - throws IllegalArgumentException, UriBuilderException { - return rewrite(wrapped.buildFromMap(values)); - } - - @Override - public URI buildFromEncodedMap(Map<String, ? extends Object> values) - throws IllegalArgumentException, UriBuilderException { - return rewrite(wrapped.buildFromEncodedMap(values)); - } - - @Override - public URI build(Object... values) throws IllegalArgumentException, - UriBuilderException { - return rewrite(wrapped.build(values)); - } - - @Override - public URI build(Object[] values, boolean encodeSlashInPath) - throws IllegalArgumentException, UriBuilderException { - return rewrite(wrapped.build(values, encodeSlashInPath)); - } - - @Override - public URI buildFromEncoded(Object... values) - throws IllegalArgumentException, UriBuilderException { - return rewrite(wrapped.buildFromEncoded(values)); - } - - @Override - public URI buildFromMap(Map<String, ?> values, - boolean encodeSlashInPath) throws IllegalArgumentException, - UriBuilderException { - return rewrite(wrapped.buildFromEncoded(values, - encodeSlashInPath)); - } - - @Override - public UriBuilder uri(URI uri) throws IllegalArgumentException { - wrapped.uri(uri); - return this; - } - - @Override - public UriBuilder uri(String uriTemplate) - throws IllegalArgumentException { - wrapped.uri(uriTemplate); - return this; - } - - @Override - public String toTemplate() { - return wrapped.toTemplate(); - } - - @Override - public UriBuilder scheme(String scheme) - throws IllegalArgumentException { - wrapped.scheme(scheme); - return this; - } - - @Override - public UriBuilder schemeSpecificPart(String ssp) - throws IllegalArgumentException { - wrapped.schemeSpecificPart(ssp); - return this; - } - - @Override - public UriBuilder userInfo(String ui) { - wrapped.userInfo(ui); - return this; - } - - @Override - public UriBuilder host(String host) throws IllegalArgumentException { - wrapped.host(host); - return this; - } - - @Override - public UriBuilder port(int port) throws IllegalArgumentException { - wrapped.port(port); - return this; - } - - @Override - public UriBuilder replacePath(String path) { - wrapped.replacePath(path); - return this; - } - - @Override - public UriBuilder path(String path) throws IllegalArgumentException { - wrapped.path(path); - return this; - } - - @Override - public UriBuilder path( - @java.lang.SuppressWarnings("rawtypes") Class resource) - throws IllegalArgumentException { - wrapped.path(resource); - return this; - } - - @Override - public UriBuilder path( - @java.lang.SuppressWarnings("rawtypes") Class resource, - String method) throws IllegalArgumentException { - wrapped.path(resource, method); - return this; - } - - @Override - public UriBuilder path(Method method) - throws IllegalArgumentException { - wrapped.path(method); - return this; - } - - @Override - public UriBuilder segment(String... segments) - throws IllegalArgumentException { - wrapped.segment(segments); - return this; - } - - @Override - public UriBuilder replaceMatrix(String matrix) - throws IllegalArgumentException { - wrapped.replaceMatrix(matrix); - return this; - } - - @Override - public UriBuilder matrixParam(String name, Object... values) - throws IllegalArgumentException { - wrapped.matrixParam(name, values); - return this; - } - - @Override - public UriBuilder replaceMatrixParam(String name, Object... values) - throws IllegalArgumentException { - wrapped.replaceMatrixParam(name, values); - return this; - } - - @Override - public UriBuilder replaceQuery(String query) - throws IllegalArgumentException { - wrapped.replaceQuery(query); - return this; - } - - @Override - public UriBuilder queryParam(String name, Object... values) - throws IllegalArgumentException { - wrapped.queryParam(name, values); - return this; - } - - @Override - public UriBuilder replaceQueryParam(String name, Object... values) - throws IllegalArgumentException { - wrapped.replaceQueryParam(name, values); - return this; - } - - @Override - public UriBuilder fragment(String fragment) { - wrapped.fragment(fragment); - return this; - } - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/VersionedElement.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/VersionedElement.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/VersionedElement.java deleted file mode 100644 index 735a72d..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/VersionedElement.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.common.Namespaces.SERVER; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -import org.apache.commons.logging.Log; - -/** - * The type of an element that declares the version of the server that produced - * it. - * - * @author Donal Fellows - */ -@XmlType(name = "VersionedElement", namespace = SERVER) -public abstract class VersionedElement { - /** What version of server produced this element? */ - @XmlAttribute(namespace = SERVER) - public String serverVersion; - /** What revision of server produced this element? Derived from SCM commit. */ - @XmlAttribute(namespace = SERVER) - public String serverRevision; - /** When was the server built? */ - @XmlAttribute(namespace = SERVER) - public String serverBuildTimestamp; - public static final String VERSION, REVISION, TIMESTAMP; - static { - Log log = getLog("Taverna.Server.Webapp"); - Properties p = new Properties(); - try { - try (InputStream is = VersionedElement.class - .getResourceAsStream("/version.properties")) { - p.load(is); - } - } catch (IOException e) { - log.warn("failed to read /version.properties", e); - } - VERSION = p.getProperty("tavernaserver.version", "unknownVersion"); - REVISION = String.format("%s (tag: %s)", - p.getProperty("tavernaserver.branch", "unknownRevision"), - p.getProperty("tavernaserver.revision.describe", "unknownTag")); - TIMESTAMP = p - .getProperty("tavernaserver.timestamp", "unknownTimestamp"); - } - - public VersionedElement() { - } - - protected VersionedElement(boolean ignored) { - serverVersion = VERSION; - serverRevision = REVISION; - serverBuildTimestamp = TIMESTAMP; - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java deleted file mode 100644 index 3a7d5f7..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/Workflow.java +++ /dev/null @@ -1,380 +0,0 @@ -/* - */ -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static javax.xml.bind.Marshaller.JAXB_ENCODING; -import static javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT; -import static javax.xml.bind.annotation.XmlAccessType.NONE; -import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.rest.handler.Scufl2DocumentHandler.SCUFL2; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_NS; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_ROOTNAME; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.Externalizable; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.io.Serializable; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.URL; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.parsers.DocumentBuilderFactory; - -import org.taverna.server.master.rest.handler.Scufl2DocumentHandler; -import org.taverna.server.master.rest.handler.T2FlowDocumentHandler; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.SAXException; - -import org.apache.taverna.scufl2.api.common.NamedSet; -import org.apache.taverna.scufl2.api.container.WorkflowBundle; -import org.apache.taverna.scufl2.api.io.ReaderException; -import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; -import org.apache.taverna.scufl2.api.io.WriterException; -import org.apache.taverna.scufl2.api.profiles.Profile; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * Encapsulation of a T2flow or Scufl2 document. - * - * @author Donal K. Fellows - */ -@XmlRootElement(name = "workflow") -@XmlType(name = "Workflow") -@XmlAccessorType(NONE) -public class Workflow implements Serializable, Externalizable { - /** Literal document, if present. */ - @XmlAnyElement(lax = true) - private Element content; - /** SCUFL2 bundle, if present. */ - @XmlTransient - private WorkflowBundle bundle; - /** Which came first, the bundle or the t2flow document. */ - @XmlTransient - private boolean isBundleFirst; - - private static Marshaller marshaller; - private static Unmarshaller unmarshaller; - private final static String ENCODING = "UTF-8"; - private final static WorkflowBundleIO io; - static { - try { - JAXBContext context = JAXBContext.newInstance(Workflow.class); - marshaller = context.createMarshaller(); - unmarshaller = context.createUnmarshaller(); - marshaller.setProperty(JAXB_ENCODING, ENCODING); - marshaller.setProperty(JAXB_FORMATTED_OUTPUT, false); - } catch (JAXBException e) { - getLog("Taverna.Server.Webapp").fatal( - "failed to build JAXB context for working with " - + Workflow.class, e); - } - io = new WorkflowBundleIO(); - } - - public enum ContentType { - T2FLOW(T2FlowDocumentHandler.T2FLOW), SCUFL2( - Scufl2DocumentHandler.SCUFL2); - private String type; - - ContentType(String type) { - this.type = type; - } - - public String getContentType() { - return type; - } - } - - public Workflow() { - } - - public Workflow(Element element) { - this.content = element; - this.isBundleFirst = false; - } - - public Workflow(WorkflowBundle bundle) { - this.bundle = bundle; - this.isBundleFirst = true; - } - - public Workflow(URL url) throws ReaderException, IOException { - this(io.readBundle(url, null)); - } - - /** - * What content type would this workflow "prefer" to be? - */ - public ContentType getPreferredContentType() { - if (isBundleFirst) - return ContentType.SCUFL2; - else - return ContentType.T2FLOW; - } - - /** - * Retrieves the workflow as a SCUFL2 document, converting it if necessary. - * - * @return The SCUFL2 document. - * @throws IOException - * If anything goes wrong. - */ - public WorkflowBundle getScufl2Workflow() throws IOException { - try { - if (bundle == null) - bundle = io.readBundle(new ByteArrayInputStream(getAsT2Flow()), - T2FLOW); - return bundle; - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new IOException("problem when converting to SCUFL2", e); - } - } - - /** - * Get the bytes of the serialized SCUFL2 workflow. - * - * @return Array of bytes. - * @throws IOException - * If serialization fails. - * @throws WriterException - * If conversion fails. - */ - public byte[] getScufl2Bytes() throws IOException, WriterException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - io.writeBundle(getScufl2Workflow(), baos, SCUFL2); - return baos.toByteArray(); - } - - /** - * Retrieves the workflow as a T2Flow document, converting it if necessary. - * - * @return The T2Flow document. - * @throws IOException - * If anything goes wrong. - */ - public Element getT2flowWorkflow() throws IOException { - try { - if (content != null) - return content; - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - io.writeBundle(bundle, baos, T2FLOW); - Document doc; - try { - DocumentBuilderFactory dbf = DocumentBuilderFactory - .newInstance(); - dbf.setNamespaceAware(true); - doc = dbf.newDocumentBuilder().parse( - new ByteArrayInputStream(baos.toByteArray())); - } catch (SAXException e) { - throw new IOException("failed to convert to DOM tree", e); - } - Element e = doc.getDocumentElement(); - if (e.getNamespaceURI().equals(T2FLOW_NS) - && e.getNodeName().equals(T2FLOW_ROOTNAME)) - return content = e; - throw new IOException( - "unexpected element when converting to T2Flow: {" - + e.getNamespaceURI() + "}" + e.getNodeName()); - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new IOException("problem when converting to SCUFL2", e); - } - } - - /** - * @return The name of the main workflow profile, or <tt>null</tt> if there - * is none. - */ - public String getMainProfileName() { - try { - return getScufl2Workflow().getMainProfile().getName(); - } catch (IOException e) { - return null; - } - } - - /** - * @return The set of profiles supported over this workflow. - */ - public NamedSet<Profile> getProfiles() { - try { - return getScufl2Workflow().getProfiles(); - } catch (IOException e) { - return new NamedSet<Profile>(); - } - } - - /** - * Convert from marshalled form. - * - * @throws JAXBException - * If the conversion fails. - */ - public static Workflow unmarshal(String representation) - throws JAXBException { - StringReader sr = new StringReader(representation); - return (Workflow) unmarshaller.unmarshal(sr); - } - - /** - * Convert to marshalled form. - */ - public String marshal() throws JAXBException { - StringWriter sw = new StringWriter(); - marshaller.marshal(this, sw); - return sw.toString(); - } - - @Override - public void readExternal(ObjectInput in) throws IOException, - ClassNotFoundException { - try { - ByteArrayInputStream bytes = readbytes(in); - if (bytes != null) - try (Reader r = new InputStreamReader(bytes, ENCODING)) { - content = ((Workflow) unmarshaller.unmarshal(r)).content; - } - bytes = readbytes(in); - if (bytes != null) - bundle = io.readBundle(bytes, SCUFL2); - isBundleFirst = in.readBoolean(); - return; - } catch (JAXBException e) { - throw new IOException("failed to unmarshal", e); - } catch (ClassCastException e) { - throw new IOException("bizarre result of unmarshalling", e); - } catch (ReaderException e) { - throw new IOException("failed to unmarshal", e); - } - } - - private byte[] getAsT2Flow() throws IOException, JAXBException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - OutputStreamWriter w = new OutputStreamWriter(baos, ENCODING); - marshaller.marshal(this, w); - w.close(); - return baos.toByteArray(); - } - - private byte[] getAsScufl2() throws IOException, WriterException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - io.writeBundle(bundle, baos, SCUFL2); - baos.close(); - return baos.toByteArray(); - } - - @Override - public void writeExternal(ObjectOutput out) throws IOException { - try { - writebytes(out, (content != null) ? getAsT2Flow() : null); - } catch (JAXBException e) { - throw new IOException("failed to marshal t2flow", e); - } - try { - writebytes(out, (bundle != null) ? getAsScufl2() : null); - } catch (WriterException e) { - throw new IOException("failed to marshal scufl2", e); - } - out.writeBoolean(isBundleFirst); - } - - private ByteArrayInputStream readbytes(ObjectInput in) throws IOException { - int len = in.readInt(); - if (len > 0) { - byte[] bytes = new byte[len]; - in.readFully(bytes); - return new ByteArrayInputStream(bytes); - } - return null; - } - - private void writebytes(ObjectOutput out, byte[] data) throws IOException { - out.writeInt(data == null ? 0 : data.length); - if (data != null && data.length > 0) - out.write(data); - } - - /** - * Make up for the lack of an integrated XPath engine. - * - * @param name - * The element names to look up from the root of the contained - * document. - * @return The looked up element, or <tt>null</tt> if it doesn't exist. - */ - private Element getEl(String... name) { - Element el = content; - boolean skip = true; - for (String n : name) { - if (skip) { - skip = false; - continue; - } - if (el == null) - return null; - NodeList nl = el.getElementsByTagNameNS(T2FLOW_NS, n); - if (nl.getLength() == 0) - return null; - Node node = nl.item(0); - if (node instanceof Element) - el = (Element) node; - else - return null; - } - return el; - } - - /** - * @return The content of the embedded - * <tt><workflow><dataflow><name></tt> element. - */ - @XmlTransient - public String getName() { - return getEl("workflow", "dataflow", "name").getTextContent(); - } - - /** - * @return The embedded <tt><workflow></tt> element. - */ - @XmlTransient - public Element getWorkflowRoot() { - return getEl("workflow"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/package-info.java deleted file mode 100644 index e000cef..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/package-info.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - */ -/** - * This package contains the common XML elements used throughout Taverna Server's various interfaces. - * @author Donal Fellows - */ -@XmlSchema(namespace = SERVER, elementFormDefault = QUALIFIED, attributeFormDefault = QUALIFIED, xmlns = { - @XmlNs(prefix = "xlink", namespaceURI = XLINK), - @XmlNs(prefix = "ts", namespaceURI = SERVER), - @XmlNs(prefix = "ts-rest", namespaceURI = SERVER_REST), - @XmlNs(prefix = "ts-soap", namespaceURI = SERVER_SOAP), - @XmlNs(prefix = "feed", namespaceURI = FEED), - @XmlNs(prefix = "admin", namespaceURI = ADMIN) }) -package org.taverna.server.master.common; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED; -import static org.taverna.server.master.common.Namespaces.ADMIN; -import static org.taverna.server.master.common.Namespaces.FEED; -import static org.taverna.server.master.common.Namespaces.SERVER; -import static org.taverna.server.master.common.Namespaces.SERVER_REST; -import static org.taverna.server.master.common.Namespaces.SERVER_SOAP; -import static org.taverna.server.master.common.Namespaces.XLINK; - -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; - http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/common/version/Version.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/version/Version.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/common/version/Version.java deleted file mode 100644 index bd50db2..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/common/version/Version.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - */ -package org.taverna.server.master.common.version; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static org.taverna.server.master.common.version.Constants.PATCH; -import static org.taverna.server.master.common.version.Constants.VERSION; - -/** - * Common location for describing the version of the server. - * - * @author Donal Fellows - */ -public interface Version { - public static final String JAVA = VERSION + Constants.releaseChar + PATCH; - public static final String HTML = VERSION + Constants.releaseHEnt + PATCH; - public static final String XML = VERSION + Constants.releaseXEnt + PATCH; -} - -/** - * The pieces of a version string. - * - * @author Donal Fellows - */ -interface Constants { - static final String MAJOR = "3"; - static final String MINOR = "1"; - static final String PATCH = "0"; - - static final char alphaChar = '\u03b1'; - static final char betaChar = '\u03b2'; - static final char releaseChar = '.'; - static final String alphaHEnt = "α"; - static final String betaHEnt = "β"; - static final String releaseHEnt = "."; - static final String alphaXEnt = "α"; - static final String betaXEnt = "β"; - static final String releaseXEnt = "."; - - static final String VERSION = MAJOR + "." + MINOR; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/Default.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/Default.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/Default.java deleted file mode 100644 index 679a5f4..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/Default.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - */ -package org.taverna.server.master.defaults; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import org.taverna.server.master.common.Status; -import org.taverna.server.master.localworker.LocalWorkerState; - -/** - * This defines a collection of default values, collecting them from various - * parts of the server. - * - * @author Donal Fellows - */ -public interface Default { - /** The default value of the <tt>prefix</tt> property. */ - static final String AUTHORITY_PREFIX = "LOCALUSER_"; - - /** - * The name of the resource that is the implementation of the subprocess - * that this class will fork off. - */ - static final String SERVER_WORKER_IMPLEMENTATION_JAR = "util/server.worker.jar"; - - /** - * The name of the resource that is the implementation of the subprocess - * that manages secure forking. - */ - static final String SECURE_FORK_IMPLEMENTATION_JAR = "util/secure.fork.jar"; - - /** - * The name of the resource that is the implementation of the subprocess - * that acts as the RMI registry. - */ - static final String REGISTRY_JAR = "util/rmi.daemon.jar"; - - /** Initial lifetime of runs, in minutes. */ - static final int RUN_LIFE_MINUTES = 20; - - /** - * Maximum number of runs to exist at once. Note that this includes when - * they are just existing for the purposes of file transfer ( - * {@link Status#Initialized}/{@link Status#Finished} states). - */ - static final int RUN_COUNT_MAX = 5; - - /** - * Prefix to use for RMI names. - */ - static final String RMI_PREFIX = "ForkRunFactory."; - - /** Default value for {@link LocalWorkerState#passwordFile}. */ - static final String PASSWORD_FILE = null; - - /** - * The extra arguments to pass to the subprocess. - */ - static final String[] EXTRA_ARGUMENTS = new String[0]; - - /** - * How long to wait for subprocess startup, in seconds. - */ - static final int SUBPROCESS_START_WAIT = 40; - - /** - * Polling interval to use during startup, in milliseconds. - */ - static final int SUBPROCESS_START_POLL_SLEEP = 1000; - - /** - * Maximum number of {@link Status#Operating} runs at any time. - */ - static final int RUN_OPERATING_LIMIT = 10; - - /** - * What fields of a certificate we look at when understanding who it is - * talking about, in the order that we look. - */ - static final String[] CERTIFICATE_FIELD_NAMES = { "CN", "COMMONNAME", - "COMMON NAME", "COMMON_NAME", "OU", "ORGANIZATIONALUNITNAME", - "ORGANIZATIONAL UNIT NAME", "O", "ORGANIZATIONNAME", - "ORGANIZATION NAME" }; - - /** The type of certificates that are processed if we don't say otherwise. */ - static final String CERTIFICATE_TYPE = "X.509"; - - /** Max size of credential file, in kiB. */ - static final int CREDENTIAL_FILE_SIZE_LIMIT = 20; - - /** - * The notification message format to use if none is configured. - */ - public static final String NOTIFY_MESSAGE_FORMAT = "Your job with ID={0} has finished with exit code {1,number,integer}."; - - /** The address of the SMS gateway service used. */ - public static final String SMS_GATEWAY_URL = "https://www.intellisoftware.co.uk/smsgateway/sendmsg.aspx";; -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/package-info.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/package-info.java deleted file mode 100644 index 5585c77..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/defaults/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * This package contains information about the various default values supported by the server. - * @author Donal Fellows - */ -package org.taverna.server.master.defaults; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadInputPortNameException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadInputPortNameException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadInputPortNameException.java deleted file mode 100644 index 64d07f0..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadInputPortNameException.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - */ -package org.taverna.server.master.exceptions; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import javax.xml.ws.WebFault; - -/** - * Indicates that the port name was not recognized. - * - * @author Donal Fellows - */ -@WebFault(name = "BadInputPortNameFault") -@SuppressWarnings("serial") -public class BadInputPortNameException extends Exception { - public BadInputPortNameException(String msg) { - super(msg); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadPropertyValueException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadPropertyValueException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadPropertyValueException.java deleted file mode 100644 index 61bf740..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadPropertyValueException.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - */ -package org.taverna.server.master.exceptions; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import javax.xml.ws.WebFault; - -/** - * Indicates a bad property value. - * - * @author Donal Fellows - */ -@WebFault(name = "BadPropertyValueFault") -public class BadPropertyValueException extends NoListenerException { - private static final long serialVersionUID = -8459491388504556875L; - - public BadPropertyValueException(String msg) { - super(msg); - } - - public BadPropertyValueException(String msg, Throwable e) { - super(msg, e); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadStateChangeException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadStateChangeException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadStateChangeException.java deleted file mode 100644 index 152410f..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/BadStateChangeException.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - */ -package org.taverna.server.master.exceptions; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import javax.xml.ws.WebFault; - -/** - * Exception that is thrown to indicate that the state change requested for a - * run is impossible. - * - * @author Donal Fellows - */ -@WebFault(name = "NoUpdateFault") -public class BadStateChangeException extends NoUpdateException { - private static final long serialVersionUID = -4490826388447601775L; - - public BadStateChangeException() { - super("cannot do that state change"); - } - - public BadStateChangeException(Throwable t) { - super("cannot do that state change", t); - } - - public BadStateChangeException(String msg, Throwable t) { - super(msg, t); - } - - public BadStateChangeException(String message) { - super(message); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/FilesystemAccessException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/FilesystemAccessException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/FilesystemAccessException.java deleted file mode 100644 index e0894e4..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/FilesystemAccessException.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - */ -package org.taverna.server.master.exceptions; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import java.rmi.RemoteException; - -import javax.xml.ws.WebFault; - -/** - * An exception that happened when the underlying filesystem was accessed. - * @author Donal Fellows - */ -@WebFault(name = "FilesystemAccessFault") -public class FilesystemAccessException extends Exception { - private static final long serialVersionUID = 8715937300989820318L; - - public FilesystemAccessException(String msg) { - super(msg); - } - - public FilesystemAccessException(String string, Throwable cause) { - super(string, getRealCause(cause)); - } - - private static Throwable getRealCause(Throwable t) { - if (t instanceof RemoteException) { - RemoteException remote = (RemoteException) t; - if (remote.detail != null) - return remote.detail; - } - if (t.getCause() != null) - return t.getCause(); - return t; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/GeneralFailureException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/GeneralFailureException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/GeneralFailureException.java deleted file mode 100644 index de3fab5..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/GeneralFailureException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - */ -package org.taverna.server.master.exceptions; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import static org.taverna.server.master.common.Namespaces.SERVER_SOAP; - -import javax.xml.ws.WebFault; - -/** - * Some sort of exception that occurred which we can't map any other way. This - * is generally indicative of a problem server-side. - * - * @author Donal Fellows - */ -@WebFault(name = "GeneralFailureFault", targetNamespace = SERVER_SOAP) -@SuppressWarnings("serial") -public class GeneralFailureException extends RuntimeException { - public GeneralFailureException(Throwable cause) { - super(cause.getMessage(), cause); - } - - public GeneralFailureException(String message, Throwable cause) { - super(message, cause); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/InvalidCredentialException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/InvalidCredentialException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/InvalidCredentialException.java deleted file mode 100644 index 7e00093..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/InvalidCredentialException.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - */ -package org.taverna.server.master.exceptions; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -/** - * An exception that is thrown to indicate that a credential-descriptor or - * trust-descriptor supplied as part of a credential or trust management - * operation is invalid. - * - * @author Donal Fellows - * - */ -@SuppressWarnings("serial") -public class InvalidCredentialException extends Exception { - private static final String MSG = "that credential is invalid"; - - public InvalidCredentialException() { - super(MSG); - } - - public InvalidCredentialException(String reason) { - super(MSG + ": " + reason); - } - - public InvalidCredentialException(String reason, Throwable cause) { - this(reason); - initCause(cause); - } - - public InvalidCredentialException(Throwable cause) { - this(cause.getMessage(), cause); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCreateException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCreateException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCreateException.java deleted file mode 100644 index d665adb..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCreateException.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - */ -package org.taverna.server.master.exceptions; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -import javax.xml.ws.WebFault; - - -/** - * Exception that is thrown to indicate that the user is not permitted to - * create something. - * - * @author Donal Fellows - */ -@WebFault(name = "NoCreateFault") -public class NoCreateException extends NoUpdateException { - private static final long serialVersionUID = 270413810410167235L; - - public NoCreateException() { - super("not permitted to create"); - } - - public NoCreateException(String string) { - super(string); - } - - public NoCreateException(String string, Throwable e) { - super(string, e); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/00397eff/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCredentialException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCredentialException.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCredentialException.java deleted file mode 100644 index b351c1c..0000000 --- a/taverna-server-webapp/src/main/java/org/taverna/server/master/exceptions/NoCredentialException.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - */ -package org.taverna.server.master.exceptions; -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ - -/** - * Exception that indicates the absence of an expected credential. - * - * @author Donal Fellows - */ -@SuppressWarnings("serial") -public class NoCredentialException extends Exception { - public NoCredentialException() { - super("no such credential"); - } -}
