Merge branch 'taverna-support-utilities'
>From https://github.com/taverna/taverna-support-utilities master
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/4357f05e
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/4357f05e
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/4357f05e
Branch: refs/heads/master
Commit: 4357f05ec52750928cee98b8bc0aeade3622cb91
Parents: 09b80e1 71d2d4f
Author: Stian Soiland-Reyes <[email protected]>
Authored: Fri Mar 6 22:31:48 2015 +0000
Committer: Stian Soiland-Reyes <[email protected]>
Committed: Fri Mar 6 22:31:48 2015 +0000
----------------------------------------------------------------------
.gitignore | 24 +
1/pom.xml | 75 +++
pom.xml | 6 +
taverna-beaninfo/pom.xml | 21 +
.../t2/lang/beans/PropertyAnnotated.java | 74 +++
.../t2/lang/beans/PropertyAnnotation.java | 109 +++
.../lang/beans/PropertyAnnotationExtractor.java | 202 ++++++
taverna-io/pom.xml | 20 +
.../net/sf/taverna/t2/lang/io/StreamCopier.java | 69 ++
.../sf/taverna/t2/lang/io/StreamDevourer.java | 106 +++
taverna-partition/pom.xml | 22 +
.../sf/taverna/t2/partition/HashSetModel.java | 116 ++++
.../net/sf/taverna/t2/partition/Partition.java | 441 +++++++++++++
.../t2/partition/PartitionAlgorithm.java | 47 ++
.../t2/partition/PartitionAlgorithmSetSPI.java | 36 +
.../t2/partition/PropertyExtractorRegistry.java | 37 ++
.../t2/partition/PropertyExtractorSPI.java | 44 ++
.../java/net/sf/taverna/t2/partition/Query.java | 56 ++
.../sf/taverna/t2/partition/RootPartition.java | 394 +++++++++++
.../net/sf/taverna/t2/partition/SetModel.java | 53 ++
.../t2/partition/SetModelChangeListener.java | 42 ++
.../algorithms/CustomPartitionAlgorithm.java | 98 +++
.../LiteralValuePartitionAlgorithm.java | 106 +++
.../ui/PartitionAlgorithmListEditor.java | 224 +++++++
.../t2/partition/ui/TableTreeNodeColumn.java | 69 ++
.../t2/partition/ui/TableTreeNodeRenderer.java | 554 ++++++++++++++++
.../net/sf/taverna/t2/partition/ui/UITest.java | 58 ++
.../t2/partition/PartitionTestApplication.java | 280 ++++++++
.../LiteralValuePartitionAlgorithmTest.java | 68 ++
taverna-ui/pom.xml | 35 +
.../net/sf/taverna/t2/lang/ui/CArrowImage.java | 198 ++++++
.../t2/lang/ui/CTransferableTreePath.java | 66 ++
.../taverna/t2/lang/ui/DeselectingButton.java | 45 ++
.../sf/taverna/t2/lang/ui/DialogTextArea.java | 83 +++
.../sf/taverna/t2/lang/ui/EdgeLineBorder.java | 91 +++
.../sf/taverna/t2/lang/ui/EditorKeySetUtil.java | 67 ++
.../taverna/t2/lang/ui/ExtensionFileFilter.java | 105 +++
.../net/sf/taverna/t2/lang/ui/FileTools.java | 117 ++++
.../net/sf/taverna/t2/lang/ui/HtmlUtils.java | 87 +++
.../sf/taverna/t2/lang/ui/JSplitPaneExt.java | 56 ++
.../sf/taverna/t2/lang/ui/KeywordDocument.java | 568 ++++++++++++++++
.../t2/lang/ui/LineEnabledTextPanel.java | 106 +++
.../net/sf/taverna/t2/lang/ui/LinePainter.java | 163 +++++
.../t2/lang/ui/LineWrappingTextArea.java | 217 ++++++
.../sf/taverna/t2/lang/ui/NoWrapEditorKit.java | 77 +++
.../sf/taverna/t2/lang/ui/ReadOnlyTextArea.java | 50 ++
.../t2/lang/ui/SanitisingDocumentFilter.java | 60 ++
.../net/sf/taverna/t2/lang/ui/ShadedLabel.java | 126 ++++
.../net/sf/taverna/t2/lang/ui/TableMap.java | 69 ++
.../net/sf/taverna/t2/lang/ui/TableSorter.java | 341 ++++++++++
.../t2/lang/ui/ValidatingUserInputDialog.java | 274 ++++++++
.../net/sf/taverna/t2/lang/ui/icons/Icons.java | 48 ++
.../lang/ui/tabselector/ScrollController.java | 85 +++
.../sf/taverna/t2/lang/ui/tabselector/Tab.java | 200 ++++++
.../t2/lang/ui/tabselector/TabLayout.java | 135 ++++
.../ui/tabselector/TabSelectorComponent.java | 99 +++
.../lang/ui/treetable/AbstractCellEditor.java | 81 +++
.../ui/treetable/AbstractTreeTableModel.java | 198 ++++++
.../t2/lang/ui/treetable/JTreeTable.LICENSE | 59 ++
.../t2/lang/ui/treetable/JTreeTable.java | 657 +++++++++++++++++++
.../t2/lang/ui/treetable/LinesBorder.java | 178 +++++
.../t2/lang/ui/treetable/TreeTableModel.java | 69 ++
.../ui/treetable/TreeTableModelAdapter.java | 132 ++++
.../net/sf/taverna/t2/lang/ui/icons/ok.png | Bin 0 -> 3318 bytes
.../net/sf/taverna/t2/lang/ui/icons/severe.png | Bin 0 -> 867 bytes
.../net/sf/taverna/t2/lang/ui/icons/warning.png | Bin 0 -> 3459 bytes
taverna-uibuilder/pom.xml | 25 +
.../lang/uibuilder/AbstractListComponent.java | 521 +++++++++++++++
.../t2/lang/uibuilder/AlignableComponent.java | 29 +
.../sf/taverna/t2/lang/uibuilder/Alignment.java | 66 ++
.../taverna/t2/lang/uibuilder/BeanCheckBox.java | 54 ++
.../t2/lang/uibuilder/BeanComponent.java | 420 ++++++++++++
.../t2/lang/uibuilder/BeanEnumComboBox.java | 89 +++
.../taverna/t2/lang/uibuilder/BeanTextArea.java | 89 +++
.../t2/lang/uibuilder/BeanTextComponent.java | 174 +++++
.../t2/lang/uibuilder/BeanTextField.java | 60 ++
.../net/sf/taverna/t2/lang/uibuilder/Icons.java | 41 ++
.../taverna/t2/lang/uibuilder/ListHandler.java | 67 ++
.../lang/uibuilder/RecursiveListComponent.java | 98 +++
.../sf/taverna/t2/lang/uibuilder/UIBuilder.java | 236 +++++++
.../lang/uibuilder/UIConstructionException.java | 29 +
.../t2/lang/uibuilder/WrappedListComponent.java | 105 +++
.../sf/taverna/t2/lang/uibuilder/package.html | 4 +
.../net/sf/taverna/t2/lang/uibuilder/delete.png | Bin 0 -> 1120 bytes
.../net/sf/taverna/t2/lang/uibuilder/down.png | Bin 0 -> 1077 bytes
.../net/sf/taverna/t2/lang/uibuilder/new.png | Bin 0 -> 1146 bytes
.../net/sf/taverna/t2/lang/uibuilder/up.png | Bin 0 -> 1074 bytes
.../taverna/t2/lang/uibuilder/Application.java | 48 ++
.../taverna/t2/lang/uibuilder/Application2.java | 44 ++
.../t2/lang/uibuilder/BeanWithBoundProps.java | 74 +++
.../lang/uibuilder/BeanWithListProperties.java | 35 +
.../t2/lang/uibuilder/BeanWithNestedList.java | 28 +
.../t2/lang/uibuilder/PrimitiveTypeBean.java | 101 +++
.../taverna/t2/lang/uibuilder/SampleEnum.java | 13 +
.../taverna/t2/lang/uibuilder/TopLevelBean.java | 43 ++
95 files changed, 10886 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4357f05e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 8db98c2,7e5841f..0339d1b
--- a/pom.xml
+++ b/pom.xml
@@@ -19,96 -3,73 +19,102 @@@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.sf.taverna</groupId>
+ <groupId>org.apache.taverna</groupId>
<artifactId>taverna-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>1-incubating-SNAPSHOT</version>
</parent>
-
- <name>Taverna support utilities</name>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>lang</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <groupId>org.apache.taverna.workbench</groupId>
+ <artifactId>taverna-workbench</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.log4j</groupId>
-
<artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository</url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
-
<url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository -
SpringSource Bundle Releases</name>
-
<url>http://repository.springsource.com/maven/bundles/release</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository -
External Bundle Releases</name>
-
<url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
- </repositories>
+ <name>Apache Taverna Workbench</name>
+ <description>Graphical workbench for editing and running Apache Taverna
workflows</description>
+ <properties>
+
<taverna.language.version>0.15.0-incubating-SNAPSHOT</taverna.language.version>
+ <taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version>
+ <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
+
<taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
+ </properties>
<modules>
- <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>
-
<developerConnection>scm:git:ssh://[email protected]:taverna/taverna-support-utilities.git</developerConnection>
-
<url>https://github.com/taverna/taverna-support-utilities</url>
- <tag>HEAD</tag>
- </scm>
+ <module>taverna-dataflow-activity-ui</module>
+ <module>taverna-disabled-activity-ui</module>
+ <module>taverna-stringconstant-activity-ui</module>
+ <module>taverna-unrecognized-activity-ui</module>
+ <module>taverna-workbench-activity-icons-api</module>
+ <module>taverna-workbench-activity-palette-api</module>
+ <module>taverna-workbench-activity-palette-impl</module>
+ <module>taverna-workbench-activity-palette-ui</module>
+ <module>taverna-workbench-activity-tools</module>
+ <module>taverna-workbench-configuration-api</module>
+ <module>taverna-workbench-configuration-impl</module>
+ <module>taverna-workbench-contextual-views</module>
+ <module>taverna-workbench-contextual-views-api</module>
+ <module>taverna-workbench-contextual-views-impl</module>
+ <module>taverna-workbench-credential-manager-ui</module>
+ <module>taverna-workbench-data-management-config-ui</module>
+ <module>taverna-workbench-design-ui</module>
+ <module>taverna-workbench-edits-api</module>
+ <module>taverna-workbench-edits-impl</module>
+ <module>taverna-workbench-file-api</module>
+ <module>taverna-workbench-file-impl</module>
+ <module>taverna-workbench-graph-model</module>
+ <module>taverna-workbench-graph-view</module>
+ <module>taverna-workbench-helper</module>
+ <module>taverna-workbench-helper-api</module>
+ <module>taverna-workbench-httpproxy-config</module>
+ <module>taverna-workbench-iteration-strategy-ui</module>
+ <module>taverna-workbench-loop-ui</module>
+ <module>taverna-workbench-menu-api</module>
+ <module>taverna-workbench-menu-impl</module>
+ <module>taverna-workbench-menu-items</module>
+ <module>taverna-workbench-monitor-view</module>
+ <module>taverna-workbench-parallelize-ui</module>
+ <module>taverna-workbench-perspective-biocatalogue</module>
+ <module>taverna-workbench-perspective-design</module>
+ <module>taverna-workbench-perspective-myexperiment</module>
+ <module>taverna-workbench-perspective-results</module>
+ <module>taverna-workbench-plugin-manager</module>
+ <module>taverna-workbench-plugins-gui</module>
+ <module>taverna-workbench-reference-ui</module>
+ <module>taverna-workbench-renderers-api</module>
+ <module>taverna-workbench-renderers-exts</module>
+ <module>taverna-workbench-renderers-impl</module>
+ <module>taverna-workbench-report-api</module>
+ <module>taverna-workbench-report-explainer</module>
+ <module>taverna-workbench-report-impl</module>
+ <module>taverna-workbench-report-view</module>
+ <module>taverna-workbench-results-view</module>
+ <module>taverna-workbench-retry-ui</module>
+ <module>taverna-workbench-run-ui</module>
+ <module>taverna-workbench-selection-api</module>
+ <module>taverna-workbench-selection-impl</module>
+ <module>taverna-workbench-update-manager</module>
+ <module>taverna-workbench-workbench-api</module>
+ <module>taverna-workbench-workbench-impl</module>
+ <module>taverna-workbench-workflow-explorer</module>
+ <module>taverna-workbench-workflow-view</module>
++ <module>taverna-beans</module>
++ <module>taverna-io</module>
++ <module>taverna-observer</module>
++ <module>taverna-partition</module>
++ <module>taverna-ui</module>
++ <module>taverna-uibuilder</module>
+ </modules>
+ <scm>
+
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench.git</connection>
+
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench.git</developerConnection>
+ <url>https://github.com/apache/incubator-taverna-workbench</url>
+ <tag>HEAD</tag>
+ </scm>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
</project>
