You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@taverna.apache.org by Dmitry <re...@list.ru> on 2015/03/17 16:32:39 UTC

Apache headers

Hello,

I see there are many taverna pieces in incubator that are still in 
taverna's "uk" package.
I'd like to make two branches of "wsdl-generic":

"3.0.0-incubating-SNAPSHOT" - the same as "2.1.1" but within 
"org.apache.taverna.wsdl.*" package.
"3.1.0-incubating-SNAPSHOT" - the new one based on wsdl4j/woden + Apache 
XML Schema

Do you have an example of the apache copyright header to put into them?

Thank you,

Dmitry

Re: Apache headers

Posted by Dmitry <re...@list.ru>.
Hello Alan,

> I am not convinced those are the right names. 
I thought that first apache release is 3.0.

What is your suggestion?

I have three brunches locally

3.0 - the same as 2.5, but with org.taverna package.
3.1 - wsdl4j + woden based.
3.5 - experimental with no splitters (xml tree based).

Cheers,

Dmitry

On 3/17/2015 5:18 PM, alaninmcr wrote:
> On 17/03/2015 15:32, Dmitry wrote:
>> Hello,
>>
>> I see there are many taverna pieces in incubator that are still in
>> taverna's "uk" package.
>
> They should all be changed to org.apache in the near future.
>
>> I'd like to make two branches of "wsdl-generic":
>>
>> "3.0.0-incubating-SNAPSHOT" - the same as "2.1.1" but within
>> "org.apache.taverna.wsdl.*" package.
>> "3.1.0-incubating-SNAPSHOT" - the new one based on wsdl4j/woden + Apache
>> XML Schema
>
> I am not convinced those are the right names.
>
>> Do you have an example of the apache copyright header to put into them?
>
> Yes. Look at the top of
>
> https://github.com/apache/incubator-taverna-language/blob/master/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java 
> . All the source files in incubator-taverna-language should be 
> correctly licensed.
>
> You can get the Rat plugin to put the license for you.
>
>> Thank you,
>>
>> Dmitry
>
> Alan
> .
>


Re: Apache headers

Posted by Dmitry <re...@list.ru>.
> I am not sure if you mean to change the version number of just the
> *wsdl* bits or of all of common-activities here (I would generally
> hope to keep everything in the repository the same version unless this
> breaks semantic versioning).

My point is that changing packages without changing the version would 
break the build unless we make ALL the changes at once.

It is much easily to give a new version to the modules that have their 
packages changed.
This way any converted module will get a new version of the package.
Since we are talking about Taverna 3 release, probably have it as 
3.0.0-incubating-SNAPSHOT even the code is the same as 2.1 is logical.

This way the release will have all modules in 3.0 version which is 
simple to understand.

If I just change the wsdl-generic 2.1 to the new code, wsdl-activity 2.1 
wont compile and I would need to refactor it also so for some moment it 
will be broken.

I would like to:

1. make 3.0 wsdl-generic with WSDL4j + Woden
2. make 3.0 wsdl-activity with dependence on wsdl-generic 3.0

Do you think this is logical?

Dmitry

On 3/18/2015 5:07 PM, Stian Soiland-Reyes wrote:
> On 18 March 2015 at 13:57, Dmitry <re...@list.ru> wrote:
>
>> I have an experimental "wsdl-generic" which is based on XML-tree model
>> (directly based on XML Schema model) instead of splitters.
>> This package may be used as a stand-alone commandline tool for web services
>> execution.
> Great!
>
>
>> Because Taverna is deeply based on splitters (I think not only GUI, but also
>> SCUFL2 (?)) I do not expect this branch be included into Taverna 3.0.
> Perhaps not in the first instance, agreed.
>
>> The question is about numbering. Once we change some package to
>> "org.apache.taverna.*" other modules must be also changed.
>> Regarding "wsdl-generic" we have:
>>
>> 2.1.0-incubating-SNAPSHOT - the master (same as TAV 2.5)
>>
>> Then I did (locally) just for development
>> 3.0.0-incubating-SNAPSHOT - the same as 2.1.0 but with new
>> "org.apache.taverna.*"
> I don't understand this one. This should just be
> 2.1.0-incubating-SNAPSHOT -- which (unlike taverna-language) have not
> had its Java packages renamed yet.
>
> They should be fixed before release of 2.1.0-incubating.  We don't
> need a new major version number for that as we are switching to a
> different groupId anyway.
>
>
> Have you already fixed packages org.apache.taverna for all modules, or
> just for wsdlgeneric?  Would you be OK to also do the package rename
> on the rest of the common-activities - then you can merge your branch
> into master as 2.1.0-incubating-SNAPSHOT.
>
>
>> 3.1.0-incubating-SNAPSHOT - WSDL4j + WODEN based parser (WSDL 1.1/2.0)
>> 3.5.0-incubating-SNAPSHOT - XML-Schema based (no splitters)
>> I would like to put WSDL4j + WODEN based parser (WSDL 1.1/2.0)
>> as 3.0.0 incubating, so the first Apache release will have a new parser
>> (still with splitters, so no need to change UI).
> +1 to try to release with the wsdl4j+WODEN implementation if you are
> comfortable with that.
>
>
> I am not sure if you mean to change the version number of just the
> *wsdl* bits or of all of common-activities here (I would generally
> hope to keep everything in the repository the same version unless this
> breaks semantic versioning).
>
> I can see we need a new major version number (* or new activity type
> URI) when moving to the XML Schema one, as it means a different
> configuration in SCUFL2 and UI changes - but don't see why we would
> need it before that.
>
>
> Why do we need these 3 different version numbers, are you proposing to
> do three different releases of common-activities?
>
> If we are not - can't they just be branches in git - and then the
> version number will be whatever is when we decide to merge in the
> changes?
>
> Perhaps you run into SNAPSHOT fights of Maven downloading the
> 'classic' wsdlgeneric SNAPSHOT ? (We don't have automated build of
> your branch in Jenkins - but perhaps we should once it is in git?)
>
> Personally I would not like pre-allocate a version number like 3.5.0
> (what happened to 3.2, 3.3 and 3.4??) -- rather add the branch name,
> e.g. if master is 2.1.0-incubating-SNAPSHOT  (and might be released
> as-is as 2.1.0-incubating) - the "woden" branch could have say
> 2.1.0-woden-SNAPSHOT - but whenever it is merged into master, master's
> version would just be incremented the normal way according to semantic
> versioning.
>
>
>
>> I am ready to refactor modules as 3.0.0-incubating-SNAPSHOT changing the
>> package. Just waiting the signal to start.
> Please go ahead with package renaming! Thanks for volunteering. Just
> no need to change the version number I think..
>


Re: Apache headers

Posted by Stian Soiland-Reyes <st...@apache.org>.
On 18 March 2015 at 13:57, Dmitry <re...@list.ru> wrote:

> I have an experimental "wsdl-generic" which is based on XML-tree model
> (directly based on XML Schema model) instead of splitters.
> This package may be used as a stand-alone commandline tool for web services
> execution.

Great!


> Because Taverna is deeply based on splitters (I think not only GUI, but also
> SCUFL2 (?)) I do not expect this branch be included into Taverna 3.0.

Perhaps not in the first instance, agreed.

> The question is about numbering. Once we change some package to
> "org.apache.taverna.*" other modules must be also changed.

> Regarding "wsdl-generic" we have:
>
> 2.1.0-incubating-SNAPSHOT - the master (same as TAV 2.5)
>
> Then I did (locally) just for development
> 3.0.0-incubating-SNAPSHOT - the same as 2.1.0 but with new
> "org.apache.taverna.*"

I don't understand this one. This should just be
2.1.0-incubating-SNAPSHOT -- which (unlike taverna-language) have not
had its Java packages renamed yet.

They should be fixed before release of 2.1.0-incubating.  We don't
need a new major version number for that as we are switching to a
different groupId anyway.


Have you already fixed packages org.apache.taverna for all modules, or
just for wsdlgeneric?  Would you be OK to also do the package rename
on the rest of the common-activities - then you can merge your branch
into master as 2.1.0-incubating-SNAPSHOT.


> 3.1.0-incubating-SNAPSHOT - WSDL4j + WODEN based parser (WSDL 1.1/2.0)
> 3.5.0-incubating-SNAPSHOT - XML-Schema based (no splitters)

> I would like to put WSDL4j + WODEN based parser (WSDL 1.1/2.0)
> as 3.0.0 incubating, so the first Apache release will have a new parser
> (still with splitters, so no need to change UI).

+1 to try to release with the wsdl4j+WODEN implementation if you are
comfortable with that.


I am not sure if you mean to change the version number of just the
*wsdl* bits or of all of common-activities here (I would generally
hope to keep everything in the repository the same version unless this
breaks semantic versioning).

I can see we need a new major version number (* or new activity type
URI) when moving to the XML Schema one, as it means a different
configuration in SCUFL2 and UI changes - but don't see why we would
need it before that.


Why do we need these 3 different version numbers, are you proposing to
do three different releases of common-activities?

If we are not - can't they just be branches in git - and then the
version number will be whatever is when we decide to merge in the
changes?

Perhaps you run into SNAPSHOT fights of Maven downloading the
'classic' wsdlgeneric SNAPSHOT ? (We don't have automated build of
your branch in Jenkins - but perhaps we should once it is in git?)

Personally I would not like pre-allocate a version number like 3.5.0
(what happened to 3.2, 3.3 and 3.4??) -- rather add the branch name,
e.g. if master is 2.1.0-incubating-SNAPSHOT  (and might be released
as-is as 2.1.0-incubating) - the "woden" branch could have say
2.1.0-woden-SNAPSHOT - but whenever it is merged into master, master's
version would just be incremented the normal way according to semantic
versioning.



> I am ready to refactor modules as 3.0.0-incubating-SNAPSHOT changing the
> package. Just waiting the signal to start.

Please go ahead with package renaming! Thanks for volunteering. Just
no need to change the version number I think..

Re: Apache headers

Posted by Dmitry <re...@list.ru>.
Hello Stian,

> I think you argued earlier that wsdlgeneric is useful outside the WSDL
> Activity, and hence stays as its own module/package.
I have an experimental "wsdl-generic" which is based on XML-tree model 
(directly based on XML Schema model) instead of splitters.
This package may be used as a stand-alone commandline tool for web 
services execution.

Because Taverna is deeply based on splitters (I think not only GUI, but 
also SCUFL2 (?)) I do not expect this branch be included into Taverna 3.0.

The question is about numbering. Once we change some package to 
"org.apache.taverna.*" other modules must be also changed.

Regarding "wsdl-generic" we have:

2.1.0-incubating-SNAPSHOT - the master (same as TAV 2.5)

Then I did (locally) just for development
3.0.0-incubating-SNAPSHOT - the same as 2.1.0 but with new 
"org.apache.taverna.*"
3.1.0-incubating-SNAPSHOT - WSDL4j + WODEN based parser (WSDL 1.1/2.0)
3.5.0-incubating-SNAPSHOT - XML-Schema based (no splitters)

I would like to put WSDL4j + WODEN based parser (WSDL 1.1/2.0)
as 3.0.0 incubating, so the first Apache release will have a new parser 
(still with splitters, so no need to change UI).

I am ready to refactor modules as 3.0.0-incubating-SNAPSHOT changing the 
package.
Just waiting the signal to start.

Dmitry

On 3/18/2015 2:32 PM, Stian Soiland-Reyes wrote:
> On 17 March 2015 at 16:18, alaninmcr <al...@googlemail.com> wrote:
>
>>> I see there are many taverna pieces in incubator that are still in
>>> taverna's "uk" package.
>> They should all be changed to org.apache in the near future.
> Anyone can do this job, it's just a bit of labour in the Refactor menu
> in Eclipse (or similar).   Feel free to have a go!
>
>
> Package rename is easier to do in "leaf" modules like
> incubator-taverna-common-activities, as you won't have to update
> imports elsewhere (just remember to also update those spring XML files
> in src/main/resources).
>
>
> In earlier discussion (sorry, I can't find exactly which thread now)
> we discussed having "simple" package hierarchies which relate to the
> Maven artifact (but not necessarily to its Maven parent), with one
> optional more level. E.g.:
>
> org.apache.taverna.beanshell.BeanshellActivity
> org.apache.taverna.wsdlgeneric.soap.SOAPResponseParser.java
> org.apache.taverna.wsdl.WSDLActivity
>
> I think you argued earlier that wsdlgeneric is useful outside the WSDL
> Activity, and hence stays as its own module/package.
>
>
>>> I'd like to make two branches of "wsdl-generic":
>>>
>>> "3.0.0-incubating-SNAPSHOT" - the same as "2.1.1" but within
>>> "org.apache.taverna.wsdl.*" package.
>>> "3.1.0-incubating-SNAPSHOT" - the new one based on wsdl4j/woden + Apache
>>> XML Schema
>> I am not convinced those are the right names.
> I am a bit confused over the version numbers - we have these tags:
>
> old/wsdl-generic-1.10
> old/wsdl-generic-1.10.0
> old/wsdl-generic-1.4
> old/wsdl-generic-1.5
> old/wsdl-generic-1.6
> old/wsdl-generic-1.7
> old/wsdl-generic-1.8
> old/wsdl-generic-1.9
> old/wsdl-generic-3.0-20150106
> old/wsdl-generic-3.0-woden-20150106
> old/wsdl-generic-3.0.0-service-catalographer
> old/wsdl-generic-before-security-2009-10-28
> old/wsdl-generic-maintenance-2010-09-06
> old/wsdl-generic-maintenance-20150106
> old/wsdl-generic-pre-incubator-20150106
> old/wsdl-generic-pre-security-2009-10-28
> old/wsdl-generic-service-catalogue-parser-20150106
> old/wsdl-generic-wsdl4j-maintenance-20150106
>
> The latest released activity version I found was 2.0, so I set
> common-activities to all be 2.1.0-incubating-SNAPSHOT.
>
> http://repository.mygrid.org.uk/artifactory/mygrid-all/net/sf/taverna/wsdl-generic/
> does not list version 3.0.0-service-catalographer
>
> So I am not sure why we have introduced version 3.0 here - but I'm OK
> for bumping master of taverna-activities to 3.1.0-incubating-SNAPSHOT.
>    (3.1.x to avoid confusion with those earlier kind-of-3.0 tags)
>
>
> We can't keep the version numbers in-sync across all the repositories,
> as that would imply always releasing all the repositories (in which
> case they should be a single repository.  Therefore I didn't suggest
> earlier to change everything to version 3.x - as that could give false
> leads in that direction. (This has alerady happened in Taverna 2.x..)
>
>
> I am not so sure about the version number in the branches - perhaps
> add a qualifier instead? It should not matter during development as
> long as it's not overlapping SNAPSHOT versions in the snapshot
> repository.  In fact, if we don't deploy snapshots of the branches,
> then why would they need a separate version number?
>


Re: Apache headers

Posted by Stian Soiland-Reyes <st...@apache.org>.
On 17 March 2015 at 16:18, alaninmcr <al...@googlemail.com> wrote:

>> I see there are many taverna pieces in incubator that are still in
>> taverna's "uk" package.
> They should all be changed to org.apache in the near future.

Anyone can do this job, it's just a bit of labour in the Refactor menu
in Eclipse (or similar).   Feel free to have a go!


Package rename is easier to do in "leaf" modules like
incubator-taverna-common-activities, as you won't have to update
imports elsewhere (just remember to also update those spring XML files
in src/main/resources).


In earlier discussion (sorry, I can't find exactly which thread now)
we discussed having "simple" package hierarchies which relate to the
Maven artifact (but not necessarily to its Maven parent), with one
optional more level. E.g.:

org.apache.taverna.beanshell.BeanshellActivity
org.apache.taverna.wsdlgeneric.soap.SOAPResponseParser.java
org.apache.taverna.wsdl.WSDLActivity

I think you argued earlier that wsdlgeneric is useful outside the WSDL
Activity, and hence stays as its own module/package.


>> I'd like to make two branches of "wsdl-generic":
>>
>> "3.0.0-incubating-SNAPSHOT" - the same as "2.1.1" but within
>> "org.apache.taverna.wsdl.*" package.
>> "3.1.0-incubating-SNAPSHOT" - the new one based on wsdl4j/woden + Apache
>> XML Schema
> I am not convinced those are the right names.

I am a bit confused over the version numbers - we have these tags:

old/wsdl-generic-1.10
old/wsdl-generic-1.10.0
old/wsdl-generic-1.4
old/wsdl-generic-1.5
old/wsdl-generic-1.6
old/wsdl-generic-1.7
old/wsdl-generic-1.8
old/wsdl-generic-1.9
old/wsdl-generic-3.0-20150106
old/wsdl-generic-3.0-woden-20150106
old/wsdl-generic-3.0.0-service-catalographer
old/wsdl-generic-before-security-2009-10-28
old/wsdl-generic-maintenance-2010-09-06
old/wsdl-generic-maintenance-20150106
old/wsdl-generic-pre-incubator-20150106
old/wsdl-generic-pre-security-2009-10-28
old/wsdl-generic-service-catalogue-parser-20150106
old/wsdl-generic-wsdl4j-maintenance-20150106

The latest released activity version I found was 2.0, so I set
common-activities to all be 2.1.0-incubating-SNAPSHOT.

http://repository.mygrid.org.uk/artifactory/mygrid-all/net/sf/taverna/wsdl-generic/
does not list version 3.0.0-service-catalographer

So I am not sure why we have introduced version 3.0 here - but I'm OK
for bumping master of taverna-activities to 3.1.0-incubating-SNAPSHOT.
  (3.1.x to avoid confusion with those earlier kind-of-3.0 tags)


We can't keep the version numbers in-sync across all the repositories,
as that would imply always releasing all the repositories (in which
case they should be a single repository.  Therefore I didn't suggest
earlier to change everything to version 3.x - as that could give false
leads in that direction. (This has alerady happened in Taverna 2.x..)


I am not so sure about the version number in the branches - perhaps
add a qualifier instead? It should not matter during development as
long as it's not overlapping SNAPSHOT versions in the snapshot
repository.  In fact, if we don't deploy snapshots of the branches,
then why would they need a separate version number?

Re: Apache headers

Posted by alaninmcr <al...@googlemail.com>.
On 17/03/2015 15:32, Dmitry wrote:
> Hello,
>
> I see there are many taverna pieces in incubator that are still in
> taverna's "uk" package.

They should all be changed to org.apache in the near future.

> I'd like to make two branches of "wsdl-generic":
>
> "3.0.0-incubating-SNAPSHOT" - the same as "2.1.1" but within
> "org.apache.taverna.wsdl.*" package.
> "3.1.0-incubating-SNAPSHOT" - the new one based on wsdl4j/woden + Apache
> XML Schema

I am not convinced those are the right names.

> Do you have an example of the apache copyright header to put into them?

Yes. Look at the top of

https://github.com/apache/incubator-taverna-language/blob/master/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java 
. All the source files in incubator-taverna-language should be correctly 
licensed.

You can get the Rat plugin to put the license for you.

> Thank you,
>
> Dmitry

Alan