commit | 9d2ece5d4c0b51e040588e7effb24be099c08f88 | [log] [tgz] |
---|---|---|
author | Stian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk> | Sat Dec 20 12:25:44 2014 -0600 |
committer | Stian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk> | Sat Dec 20 12:25:44 2014 -0600 |
tree | c640a3d4be313cd05c51dacd63c5a912be0e0703 | |
parent | bcfb19d1c334485ccb809470f968404047260459 [diff] |
Revert "taverna-*" This reverts commit f1ca812ef1167891ee3cb33f9a554c38ffd39c74.
diff --git a/taverna-beans/pom.xml b/beans/pom.xml similarity index 100% rename from taverna-beans/pom.xml rename to beans/pom.xml
diff --git a/taverna-beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotated.java b/beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotated.java similarity index 100% rename from taverna-beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotated.java rename to beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotated.java
diff --git a/taverna-beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotation.java b/beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotation.java similarity index 100% rename from taverna-beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotation.java rename to beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotation.java
diff --git a/taverna-beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotationExtractor.java b/beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotationExtractor.java similarity index 100% rename from taverna-beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotationExtractor.java rename to beans/src/main/java/net/sf/taverna/t2/lang/beans/PropertyAnnotationExtractor.java
diff --git a/taverna-io/pom.xml b/io/pom.xml similarity index 100% rename from taverna-io/pom.xml rename to io/pom.xml
diff --git a/taverna-io/src/main/java/net/sf/taverna/t2/lang/io/StreamCopier.java b/io/src/main/java/net/sf/taverna/t2/lang/io/StreamCopier.java similarity index 100% rename from taverna-io/src/main/java/net/sf/taverna/t2/lang/io/StreamCopier.java rename to io/src/main/java/net/sf/taverna/t2/lang/io/StreamCopier.java
diff --git a/taverna-io/src/main/java/net/sf/taverna/t2/lang/io/StreamDevourer.java b/io/src/main/java/net/sf/taverna/t2/lang/io/StreamDevourer.java similarity index 100% rename from taverna-io/src/main/java/net/sf/taverna/t2/lang/io/StreamDevourer.java rename to io/src/main/java/net/sf/taverna/t2/lang/io/StreamDevourer.java
diff --git a/taverna-observer/pom.xml b/observer/pom.xml similarity index 100% rename from taverna-observer/pom.xml rename to observer/pom.xml
diff --git a/taverna-observer/src/main/java/net/sf/taverna/t2/lang/observer/MultiCaster.java b/observer/src/main/java/net/sf/taverna/t2/lang/observer/MultiCaster.java similarity index 100% rename from taverna-observer/src/main/java/net/sf/taverna/t2/lang/observer/MultiCaster.java rename to observer/src/main/java/net/sf/taverna/t2/lang/observer/MultiCaster.java
diff --git a/taverna-observer/src/main/java/net/sf/taverna/t2/lang/observer/Observable.java b/observer/src/main/java/net/sf/taverna/t2/lang/observer/Observable.java similarity index 100% rename from taverna-observer/src/main/java/net/sf/taverna/t2/lang/observer/Observable.java rename to observer/src/main/java/net/sf/taverna/t2/lang/observer/Observable.java
diff --git a/taverna-observer/src/main/java/net/sf/taverna/t2/lang/observer/Observer.java b/observer/src/main/java/net/sf/taverna/t2/lang/observer/Observer.java similarity index 100% rename from taverna-observer/src/main/java/net/sf/taverna/t2/lang/observer/Observer.java rename to observer/src/main/java/net/sf/taverna/t2/lang/observer/Observer.java
diff --git a/taverna-observer/src/main/java/net/sf/taverna/t2/lang/observer/package-info.java b/observer/src/main/java/net/sf/taverna/t2/lang/observer/package-info.java similarity index 100% rename from taverna-observer/src/main/java/net/sf/taverna/t2/lang/observer/package-info.java rename to observer/src/main/java/net/sf/taverna/t2/lang/observer/package-info.java
diff --git a/taverna-observer/src/test/java/net/sf/taverna/t2/lang/observer/ObserverTest.java b/observer/src/test/java/net/sf/taverna/t2/lang/observer/ObserverTest.java similarity index 100% rename from taverna-observer/src/test/java/net/sf/taverna/t2/lang/observer/ObserverTest.java rename to observer/src/test/java/net/sf/taverna/t2/lang/observer/ObserverTest.java
diff --git a/taverna-partition/pom.xml b/partition/pom.xml similarity index 100% rename from taverna-partition/pom.xml rename to partition/pom.xml
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/HashSetModel.java b/partition/src/main/java/net/sf/taverna/t2/partition/HashSetModel.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/HashSetModel.java rename to partition/src/main/java/net/sf/taverna/t2/partition/HashSetModel.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Partition.java b/partition/src/main/java/net/sf/taverna/t2/partition/Partition.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/Partition.java rename to partition/src/main/java/net/sf/taverna/t2/partition/Partition.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithm.java b/partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithm.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithm.java rename to partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithm.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithmSetSPI.java b/partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithmSetSPI.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithmSetSPI.java rename to partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithmSetSPI.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorRegistry.java b/partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorRegistry.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorRegistry.java rename to partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorRegistry.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorSPI.java b/partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorSPI.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorSPI.java rename to partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorSPI.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Query.java b/partition/src/main/java/net/sf/taverna/t2/partition/Query.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/Query.java rename to partition/src/main/java/net/sf/taverna/t2/partition/Query.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/RootPartition.java b/partition/src/main/java/net/sf/taverna/t2/partition/RootPartition.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/RootPartition.java rename to partition/src/main/java/net/sf/taverna/t2/partition/RootPartition.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModel.java b/partition/src/main/java/net/sf/taverna/t2/partition/SetModel.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModel.java rename to partition/src/main/java/net/sf/taverna/t2/partition/SetModel.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModelChangeListener.java b/partition/src/main/java/net/sf/taverna/t2/partition/SetModelChangeListener.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModelChangeListener.java rename to partition/src/main/java/net/sf/taverna/t2/partition/SetModelChangeListener.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/CustomPartitionAlgorithm.java b/partition/src/main/java/net/sf/taverna/t2/partition/algorithms/CustomPartitionAlgorithm.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/CustomPartitionAlgorithm.java rename to partition/src/main/java/net/sf/taverna/t2/partition/algorithms/CustomPartitionAlgorithm.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithm.java b/partition/src/main/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithm.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithm.java rename to partition/src/main/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithm.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/PartitionAlgorithmListEditor.java b/partition/src/main/java/net/sf/taverna/t2/partition/ui/PartitionAlgorithmListEditor.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/PartitionAlgorithmListEditor.java rename to partition/src/main/java/net/sf/taverna/t2/partition/ui/PartitionAlgorithmListEditor.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeColumn.java b/partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeColumn.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeColumn.java rename to partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeColumn.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeRenderer.java b/partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeRenderer.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeRenderer.java rename to partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeRenderer.java
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/UITest.java b/partition/src/main/java/net/sf/taverna/t2/partition/ui/UITest.java similarity index 100% rename from taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/UITest.java rename to partition/src/main/java/net/sf/taverna/t2/partition/ui/UITest.java
diff --git a/taverna-partition/src/test/java/net/sf/taverna/t2/partition/PartitionTestApplication.java b/partition/src/test/java/net/sf/taverna/t2/partition/PartitionTestApplication.java similarity index 100% rename from taverna-partition/src/test/java/net/sf/taverna/t2/partition/PartitionTestApplication.java rename to partition/src/test/java/net/sf/taverna/t2/partition/PartitionTestApplication.java
diff --git a/taverna-partition/src/test/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithmTest.java b/partition/src/test/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithmTest.java similarity index 100% rename from taverna-partition/src/test/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithmTest.java rename to partition/src/test/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithmTest.java
diff --git a/pom.xml b/pom.xml index 8a175f7..0a3d8db 100644 --- a/pom.xml +++ b/pom.xml
@@ -59,12 +59,12 @@ </repository> </repositories> <modules> - <module>taverna-beans</module> - <module>taverna-io</module> - <module>taverna-observer</module> - <module>taverna-partition</module> - <module>taverna-ui</module> - <module>taverna-uibuilder</module> + <module>beans</module> + <module>io</module> + <module>observer</module> + <module>partition</module> + <module>ui</module> + <module>uibuilder</module> </modules> <scm> <connection>scm:git:https://github.com/taverna/taverna-support-utilities.git</connection>
diff --git a/taverna-ui/pom.xml b/ui/pom.xml similarity index 100% rename from taverna-ui/pom.xml rename to ui/pom.xml
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/CArrowImage.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/CArrowImage.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/CArrowImage.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/CArrowImage.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/CTransferableTreePath.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/CTransferableTreePath.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/CTransferableTreePath.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/CTransferableTreePath.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/DeselectingButton.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/DeselectingButton.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/DeselectingButton.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/DeselectingButton.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/DialogTextArea.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/DialogTextArea.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/DialogTextArea.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/DialogTextArea.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/EditorKeySetUtil.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/EditorKeySetUtil.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/EditorKeySetUtil.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/EditorKeySetUtil.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ExtensionFileFilter.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/ExtensionFileFilter.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ExtensionFileFilter.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/ExtensionFileFilter.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/FileTools.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/FileTools.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/FileTools.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/FileTools.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/HtmlUtils.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/HtmlUtils.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/HtmlUtils.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/HtmlUtils.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/JSplitPaneExt.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/JSplitPaneExt.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/JSplitPaneExt.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/JSplitPaneExt.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/KeywordDocument.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/KeywordDocument.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/KeywordDocument.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/KeywordDocument.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/LineEnabledTextPanel.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/LineEnabledTextPanel.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/LineEnabledTextPanel.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/LineEnabledTextPanel.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/LinePainter.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/LinePainter.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/LinePainter.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/LinePainter.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/LineWrappingTextArea.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/LineWrappingTextArea.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/LineWrappingTextArea.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/LineWrappingTextArea.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ModelMap.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/ModelMap.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ModelMap.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/ModelMap.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/NoWrapEditorKit.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/NoWrapEditorKit.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/NoWrapEditorKit.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/NoWrapEditorKit.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ReadOnlyTextArea.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/ReadOnlyTextArea.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ReadOnlyTextArea.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/ReadOnlyTextArea.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/SanitisingDocumentFilter.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/SanitisingDocumentFilter.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/SanitisingDocumentFilter.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/SanitisingDocumentFilter.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ShadedLabel.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/ShadedLabel.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ShadedLabel.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/ShadedLabel.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/TableMap.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/TableMap.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/TableMap.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/TableMap.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/TableSorter.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/TableSorter.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/TableSorter.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/TableSorter.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ValidatingUserInputDialog.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/ValidatingUserInputDialog.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/ValidatingUserInputDialog.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/ValidatingUserInputDialog.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/icons/Icons.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/icons/Icons.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/icons/Icons.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/icons/Icons.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/AbstractCellEditor.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/AbstractCellEditor.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/AbstractCellEditor.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/AbstractCellEditor.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/AbstractTreeTableModel.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/AbstractTreeTableModel.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/AbstractTreeTableModel.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/AbstractTreeTableModel.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/JTreeTable.LICENSE b/ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/JTreeTable.LICENSE similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/JTreeTable.LICENSE rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/JTreeTable.LICENSE
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/JTreeTable.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/JTreeTable.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/JTreeTable.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/JTreeTable.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/LinesBorder.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/LinesBorder.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/LinesBorder.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/LinesBorder.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/TreeTableModel.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/TreeTableModel.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/TreeTableModel.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/TreeTableModel.java
diff --git a/taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/TreeTableModelAdapter.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/TreeTableModelAdapter.java similarity index 100% rename from taverna-ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/TreeTableModelAdapter.java rename to ui/src/main/java/net/sf/taverna/t2/lang/ui/treetable/TreeTableModelAdapter.java
diff --git a/taverna-ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/ok.png b/ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/ok.png similarity index 100% rename from taverna-ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/ok.png rename to ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/ok.png Binary files differ
diff --git a/taverna-ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/severe.png b/ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/severe.png similarity index 100% rename from taverna-ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/severe.png rename to ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/severe.png Binary files differ
diff --git a/taverna-ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/warning.png b/ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/warning.png similarity index 100% rename from taverna-ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/warning.png rename to ui/src/main/resources/net/sf/taverna/t2/lang/ui/icons/warning.png Binary files differ
diff --git a/taverna-uibuilder/pom.xml b/uibuilder/pom.xml similarity index 100% rename from taverna-uibuilder/pom.xml rename to uibuilder/pom.xml
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/AbstractListComponent.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/AbstractListComponent.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/AbstractListComponent.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/AbstractListComponent.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/AlignableComponent.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/AlignableComponent.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/AlignableComponent.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/AlignableComponent.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/Alignment.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/Alignment.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/Alignment.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/Alignment.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanCheckBox.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanCheckBox.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanCheckBox.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanCheckBox.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanComponent.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanComponent.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanComponent.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanComponent.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanEnumComboBox.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanEnumComboBox.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanEnumComboBox.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanEnumComboBox.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextArea.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextArea.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextArea.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextArea.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextComponent.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextComponent.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextComponent.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextComponent.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextField.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextField.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextField.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/BeanTextField.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/Icons.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/Icons.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/Icons.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/Icons.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/ListHandler.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/ListHandler.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/ListHandler.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/ListHandler.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/RecursiveListComponent.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/RecursiveListComponent.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/RecursiveListComponent.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/RecursiveListComponent.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/UIBuilder.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/UIBuilder.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/UIBuilder.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/UIBuilder.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/UIConstructionException.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/UIConstructionException.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/UIConstructionException.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/UIConstructionException.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/WrappedListComponent.java b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/WrappedListComponent.java similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/WrappedListComponent.java rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/WrappedListComponent.java
diff --git a/taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/package.html b/uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/package.html similarity index 100% rename from taverna-uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/package.html rename to uibuilder/src/main/java/net/sf/taverna/t2/lang/uibuilder/package.html
diff --git a/taverna-uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/delete.png b/uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/delete.png similarity index 100% rename from taverna-uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/delete.png rename to uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/delete.png Binary files differ
diff --git a/taverna-uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/down.png b/uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/down.png similarity index 100% rename from taverna-uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/down.png rename to uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/down.png Binary files differ
diff --git a/taverna-uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/new.png b/uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/new.png similarity index 100% rename from taverna-uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/new.png rename to uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/new.png Binary files differ
diff --git a/taverna-uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/up.png b/uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/up.png similarity index 100% rename from taverna-uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/up.png rename to uibuilder/src/main/resources/net/sf/taverna/t2/lang/uibuilder/up.png Binary files differ
diff --git a/taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/Application.java b/uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/Application.java similarity index 100% rename from taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/Application.java rename to uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/Application.java
diff --git a/taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/Application2.java b/uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/Application2.java similarity index 100% rename from taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/Application2.java rename to uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/Application2.java
diff --git a/taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithBoundProps.java b/uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithBoundProps.java similarity index 100% rename from taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithBoundProps.java rename to uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithBoundProps.java
diff --git a/taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithListProperties.java b/uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithListProperties.java similarity index 100% rename from taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithListProperties.java rename to uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithListProperties.java
diff --git a/taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithNestedList.java b/uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithNestedList.java similarity index 100% rename from taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithNestedList.java rename to uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/BeanWithNestedList.java
diff --git a/taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/PrimitiveTypeBean.java b/uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/PrimitiveTypeBean.java similarity index 100% rename from taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/PrimitiveTypeBean.java rename to uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/PrimitiveTypeBean.java
diff --git a/taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/SampleEnum.java b/uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/SampleEnum.java similarity index 100% rename from taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/SampleEnum.java rename to uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/SampleEnum.java
diff --git a/taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/TopLevelBean.java b/uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/TopLevelBean.java similarity index 100% rename from taverna-uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/TopLevelBean.java rename to uibuilder/src/test/java/net/sf/taverna/t2/lang/uibuilder/TopLevelBean.java