You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/23 11:35:33 UTC
[18/58] [abbrv] incubator-taverna-plugin-component git commit: Merge
branch 'taverna-component-repository'
Merge branch 'taverna-component-repository'
Conflicts:
.gitignore
>From https://github.com/taverna/taverna-component-repository master
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/commit/a1b4ef73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/tree/a1b4ef73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/diff/a1b4ef73
Branch: refs/heads/master
Commit: a1b4ef73cb0618d0f69b8940246e6682dd0ce28f
Parents: d4685df 4ce7eea
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sat Feb 21 17:22:39 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sat Feb 21 17:22:39 2015 +0000
----------------------------------------------------------------------
.gitignore | 1 +
taverna-component-repository/pom.xml | 83 +
.../src/main/catalog/XMLSchema.xsd | 2473 ++++++++++++++++++
.../src/main/catalog/catalog.xml | 7 +
.../src/main/catalog/xml.xsd | 287 ++
.../sf/taverna/t2/component/api/Component.java | 71 +
.../t2/component/api/ComponentException.java | 50 +
.../t2/component/api/ComponentFactory.java | 27 +
.../net/sf/taverna/t2/component/api/Family.java | 99 +
.../sf/taverna/t2/component/api/License.java | 12 +
.../sf/taverna/t2/component/api/NamedItem.java | 8 +
.../sf/taverna/t2/component/api/Registry.java | 139 +
.../taverna/t2/component/api/SharingPolicy.java | 17 +
.../sf/taverna/t2/component/api/Version.java | 206 ++
.../component/api/config/ComponentConfig.java | 5 +
.../api/config/ComponentPropertyNames.java | 14 +
.../taverna/t2/component/api/package-info.java | 6 +
.../component/api/profile/ActivityProfile.java | 5 +
.../component/api/profile/AnnotatedElement.java | 10 +
.../api/profile/ExceptionHandling.java | 32 +
.../api/profile/ExceptionReplacement.java | 27 +
.../component/api/profile/HandleException.java | 39 +
.../t2/component/api/profile/PortProfile.java | 5 +
.../t2/component/api/profile/Profile.java | 47 +
.../api/profile/SemanticAnnotationProfile.java | 54 +
.../src/main/resources/ComponentProfile.xsd | 261 ++
26 files changed, 3985 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/a1b4ef73/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 14ee0f3,7266935..2255817
--- a/.gitignore
+++ b/.gitignore
@@@ -1,25 -1,4 +1,26 @@@
-/target/
-.settings
+# ignore project files #
+.classpath
.project
-.classpath
+.settings/
+catalog-v001.xml
+
+# ignore target files #
+target/
+bin/
+build/
+dist/
+apidoc/
+*.swp
+
+# ignore svn files if there
+.svn
+
+# ignore log files #
+*.log
+/logs/*
+*/logs/*
+
+
+
+/.springBeans
++