Nice summary of the differences. I suggest that we add this list to a wiki
page to track the merging efforts. I can start to comment on the individual
modules on the wiki as soon as it appears.
Thanks,
Raymond
From: Simon Laws
Sent: Tuesday, November 18, 2008 7:13 AM
To: dev@tuscany.apache.org ; [EMAIL PROTECTED]
Subject: Re: Review and merge of trunk and equinox branch changes, was - Re:
[PROPOSAL] A staged approach to create the OASIS development stream in trunk
On Tue, Nov 18, 2008 at 3:02 PM, Simon Laws <[EMAIL PROTECTED]>
wrote:
On Tue, Nov 18, 2008 at 11:01 AM, Simon Laws <[EMAIL PROTECTED]>
wrote:
On Tue, Nov 18, 2008 at 10:50 AM, ant elder <[EMAIL PROTECTED]> wrote:
On Tue, Nov 18, 2008 at 10:44 AM, Simon Laws <[EMAIL PROTECTED]>
wrote:
On Tue, Nov 18, 2008 at 10:36 AM, ant elder <[EMAIL PROTECTED]> wrote:
On Tue, Nov 18, 2008 at 10:00 AM, Simon Laws <[EMAIL PROTECTED]>
wrote:
On Tue, Nov 18, 2008 at 9:39 AM, Simon Laws <[EMAIL PROTECTED]>
wrote:
From the parent thread we debated whether to start from the equinox branch
or from trunk. I'm keen to understand the code changes that implement the
features Ramyond has documented [1]. So as a compromise to just replacing
trunk wholesale with the equinox branch I'm going to look at it a module at
a time. The objective being to note changes and ask questions about the code
changes here. I'll make a start and see how it goes. If it's too difficult
the fallback is to just go with the branch. Regardless we can use this
exercise to review the changes so that we understand the current features in
the branch and, more importantly, how they are realized.
Regards
Simon
[1]
http://cwiki.apache.org/confluence/display/TUSCANYWIKI/OSGi+Enablement+for+Tuscany+Runtime
So first things first. The modules that are missing from the equinox branch
but are still in trunk. Clearly these are not required for the branches view
of OSGi support but they seem to fall into two categories. Those that are
junk which I'll just remove. Those that I'm not sure about so I'll move into
a /contrib/modules/folder and we can delete them at our leisure so that we
understand if they are obsolete or not.
modules/
api
assembly-java-dsj
binding-feed
binding-gdata2
binding-gdata2-runtime
core-spring
data-engine-helper
host-embedded
implementation-bpel-jbpm
monitor-logging
modules/
binding-dwr
binding-jms-policy
binding-notification
binding-sca-jms
contribution-groovy
contribution-impl
contribution-jee
contribution-updater
contribution-updater-impl
databinding-job
databinding-xstream
extensibility-osgi
extensibility-helper
host-ejb
host-openejb
host-osgi
implementation-das
implementation-data-api
implementation-data-xml
implementation-jee
implementation-notification
implementatoin-openjpa
implementation-web
implementation-web-runtime
node-dynamic
node-launcher-osgi
osgi-runtime
policy-reliability
runtime
runtime2
runtime-standalone
runtime-tomcat
runtime-war
scdl4j
thirdparty-library
Simon
I thought the plan was to bring up just the minimal modules to run the
calculator - the modules identified in [1] plus the test/sample from [2] so
we know when it works. So move everything accept those to contrib/.
...ant
[1] http://apache.markmail.org/message/ofdwyjikioosc7bn
[2] http://apache.markmail.org/message/qocoqvieeux2ct66
Yes, agreed. But in the branch some modules have been explicitly removed so
I wanted to call those out explicitly before going on the next stage of
moving all but the 36 or so modules that we need to get the calculator
working.
I should have said also that the first block of modules I think are Junk
(although I shouldn't have put host-embedded in there just yet) the second
block are the ones I'm not sure about so should go in /contrib.
Do you have the list of other modules that need moving and how do you want
to do it?
Simon
Just move all except the minimal modules to contrib/ as thats already been
proposed on the ML and no one has objected. Anything else, labelling certain
ones "junk" or sorting through why things have/haven't been included in the
sca-equinox branch i think would be better with some discussion.
...ant
ok, fair point, let me undo the delete and let this thread record the
difference for the time being. We can do the move en-mass a little later.
Let's move on and look at the diffs.
Simon
I've been through the modules that were on the list on the original mail
thread to get a feel for the types of changes. Most of the changes seem
pretty innocuous on their own to me. I collected together a few modules
where I could do with some help interpreting the changes. These are my notes
from the exercise.
Next thing is to look at the new modules and what is actually required by
calculator-equinox
General OSGI Changes In All Modules
===================================
Add manifest
Add Junit4 support
Remove mvn-bundle-plugin
Modules that haven't really changed
============================
tuscany-interface-1.4-EQUINOX-SNAPSHOT.jar
No specific changes
tuscany-assembly-xsd-1.4-EQUINOX-SNAPSHOT.jar
Mainly trunk changes
tuscany-sca-api-1.4-EQUINOX-SNAPSHOT.jar
Trunk changes
tuscany-xsd-1.4-EQUINOX-SNAPSHOT.jar
Public -> private
tuscany-contribution-namespace-1.4-EQUINOX-SNAPSHOT.jar
Mainly trunk changes
tuscany-contribution-xml-1.4-EQUINOX-SNAPSHOT.jar
Mainly trunk changes
tuscany-interface-java-jaxws-1.4-EQUINOX-SNAPSHOT.jar
Pretty much the same
tuscany-endpoint-1.4-EQUINOX-SNAPSHOT.jar
not much change
Modules where change look straightforward to merge
==========================================
tuscany-extensibility-1.4-EQUINOX-SNAPSHOT.jar
Service discovery changes
New factory extension point
tuscany-policy-1.4-EQUINOX-SNAPSHOT.jar
Service discovery changes
tuscany-definitions-1.4-EQUINOX-SNAPSHOT.jar
Change name from SCADefinitions to Definitions?
tuscany-monitor-1.4-EQUINOX-SNAPSHOT.jar
Create DefaultMonitorFactory in interface package
Move problem impl from assembly to here
Monitor extension plugability
tuscany-assembly-1.4-EQUINOX-SNAPSHOT.jar
Builder changes
Passing the monitor in
Passing policy definitions in?
Builder extension plugability
tuscany-core-spi-1.4-EQUINOX-SNAPSHOT.jar
Service discovery changes
remove some unused code
SCADefinitions -> Definitions
tuscany-contribution-java-1.4-EQUINOX-SNAPSHOT.jar
ModelFactory -> Factory
tuscany-policy-xml-1.4-EQUINOX-SNAPSHOT.jar
Some code tidying
Passing in a model resolver now?
tuscany-assembly-xml-1.4-EQUINOX-SNAPSHOT.jar
ModelFatory -> Factory
SCADefinitions -> Definitions
tuscany-interface-java-1.4-EQUINOX-SNAPSHOT.jar
Service discovery
trunk changes
tuscany-interface-java-xml-1.4-EQUINOX-SNAPSHOT.jar
Monitor changes
tuscany-node-api-1.4-EQUINOX-SNAPSHOT.jar
Refactored, name changes
tuscany-binding-sca-1.4-EQUINOX-SNAPSHOT.jar
Add "provider" package
tuscany-binding-sca-xml-1.4-EQUINOX-SNAPSHOT.jar
Thread in monitor
ModelFactory -> Factory
tuscany-implementation-java-xml-1.4-EQUINOX-SNAPSHOT.jar
ModelFactory -> Factory
test changes
tuscany-implementation-java-runtime-1.4-EQUINOX-SNAPSHOT.jar
Take account of package name changes elsewhere
tuscany-definitions-xml-1.4-EQUINOX-SNAPSHOT.jar
SCADefinitions -> Definitions
tuscany-workspace-1.4-EQUINOX-SNAPSHOT.jar
Dependency builder changes
tuscany-workspace-impl-1.4-EQUINOX-SNAPSHOT.jar
ModelFactory -> Factory
Dependency build changes
tuscany-workspace-xml-1.4-EQUINOX-SNAPSHOT.jar
Monitor Changes
Package name changes
Modules where there are lots of changes. Needs a bit of explanation
=================================================
tuscany-contribution-1.4-EQUINOX-SNAPSHOT.jar
Lots of changes
processor
Manage dependencies
Add some exceptions
Thread monitor through
ModelFactoryExtensionPoint rename
Remove package processor
Service
seems to have gone altogether. What happened to it?
tuscany-core-1.4-EQUINOX-SNAPSHOT.jar
Remove IOC from old runtime creation
ModelFactory -> Factory
Event and Store removed
SCAProxy -> Proxy
DefaultScopeRegistry?
Trunk changes
tuscany-implementation-node-1.4-EQUINOX-SNAPSHOT.jar
Builder changes - Not clear what for
ModelFactory-> Factory
tuscany-databinding-1.4-EQUINOX-SNAPSHOT.jar
Add notion of aliases? What is this for?
tuscany-databinding-jaxb-1.4-EQUINOX-SNAPSHOT.jar
Add notion of aliases?
Schema output resolver
tuscany-core-databinding-1.4-EQUINOX-SNAPSHOT.jar
ModelFactory -> Factory
Databinding alisases?
tuscany-node-impl-1.4-EQUINOX-SNAPSHOT.jar
Lots of changes. Not clear why so many.
tuscany-implementation-java-1.4-EQUINOX-SNAPSHOT.jar
Seem to be a lot of changes. Not clear why so many.
Simon
Other changes I see just by visual inspection...
Distribution
Not two directories are alike. Will have to pull in what we need
Etc
Doesn't appear in branch
itest
There are some new itests in trunk that didn't make it into the branch
samples
There are also samples that have been removed from the branch
tools
eclipse
more discrete features/plugins. Be interesting to know what these are
for
ejava
manager
process
web20
webservice
eclipse34 is not in the branch
java2wsdl & wsdl2java are moved under sdo
maven
added maven-bundle-plugin
added maven-incremental-build
added maven-eclipse-compiler
maven-tuscany-bundle-plugin is not in the branch
runtime-inspector is not in the branch
tutorial
www-services is not in the branch
Simon
