Equinox Branch Merge

Minimum Bring Up

Modules	Diff	Why?	Merging Status
tuscany-assembly-1.4-EQUINOX-SNAPSHOT.jar	Builder changes Passing the monitor in Passing policy definitions in? Builder extension plugability	Builders used to be implementation classes. Now we use the extension registry to get builders by interfaces. Builders should be stateless. Monitor and policy definitions should be passed on the methods.
tuscany-assembly-xml-1.4-EQUINOX-SNAPSHOT.jar	ModelFatory -> Factory SCADefinitions -> Definitions	It's extended to support JDK service provider patttern based factories such as XPathFactory, XMLInputFactory in addition to the model factories. Rename the interface to refactor the new function. Remove SCA prefixes as it is redudant.
tuscany-assembly-xsd-1.4-EQUINOX-SNAPSHOT.jar	Mainly trunk changes
tuscany-binding-sca-1.4-EQUINOX-SNAPSHOT.jar	Add "provider" package	provider package contains the classes that implement the Provider SPIs. This package should NOT be exported.
tuscany-binding-sca-xml-1.4-EQUINOX-SNAPSHOT.jar	Thread in monitor ModelFactory -> Factory
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	The changes are to fix the contribution processing (we used to read and resolve contributions one by one). There is no need to have a ContributionService. We now just use the PackageProcessor, StAXArtifactProcessor to parse the package and load artifact models.
tuscany-contribution-namespace-1.4-EQUINOX-SNAPSHOT.jar	Mainly trunk changes
tuscany-contribution-java-1.4-EQUINOX-SNAPSHOT.jar	ModelFactory -> Factory
tuscany-contribution-xml-1.4-EQUINOX-SNAPSHOT.jar	Mainly trunk changes
tuscany-core-1.4-EQUINOX-SNAPSHOT.jar	Remove IOC from old runtime creation ModelFactory -> Factory Event and Store removed SCAProxy -> Proxy DefaultScopeRegistry? Trunk changes	Event and Store are dead code.
tuscany-core-databinding-1.4-EQUINOX-SNAPSHOT.jar	ModelFactory -> Factory Databinding alisases	The databinding aliases are removed from trunk and should be merged into sca-equinox
tuscany-core-spi-1.4-EQUINOX-SNAPSHOT.jar	Service discovery changes remove some unused code SCADefinitions -> Definitions	ServiceDiscovery changes to make it work with OSGi
tuscany-databinding-1.4-EQUINOX-SNAPSHOT.jar	Add notion of aliases	The databinding aliases are removed from trunk and should be merged into sca-equinox
tuscany-databinding-jaxb-1.4-EQUINOX-SNAPSHOT.jar	Add notion of aliases Schema output resolver	The databinding aliases are removed from trunk and should be merged into sca-equinox
tuscany-definitions-1.4-EQUINOX-SNAPSHOT.jar	Change name from SCADefinitions to Definitions?	Remove SCA prefix
tuscany-definitions-xml-1.4-EQUINOX-SNAPSHOT.jar	SCADefinitions -> Definitions	Remove SCA prefix
tuscany-endpoint-1.4-EQUINOX-SNAPSHOT.jar	not much change
tuscany-extensibility-1.4-EQUINOX-SNAPSHOT.jar	Service discovery changes for OSGI comatibility New factory extension point
tuscany-extensibility-equinox-1.4-EQUINOX-SNAPSHOT.jar	Equinox specific but not much change
tuscany-host-http-1.4-EQUINOX-SNAPSHOT.jar	No change
tuscany-implementation-java-1.4-EQUINOX-SNAPSHOT.jar	Seem to be a lot of changes. Difficult to tell how they relate to OSGI	Refactor implementation-java to avoid having the SPI interfaces reference implementation classes as it doesn't work with OSGi imports/exports.
tuscany-implementation-java-runtime-1.4-EQUINOX-SNAPSHOT.jar	Take account of package name changes elsewhere
tuscany-implementation-java-xml-1.4-EQUINOX-SNAPSHOT.jar	ModelFactory -> Factory test changes
tuscany-implementation-node-1.4-EQUINOX-SNAPSHOT.jar	Builder changes - Not clear what for ModelFactory-> Factory	See the assembly module
tuscany-implementation-node-runtime-1.4-EQUINOX-SNAPSHOT.jar	Node facade has added component context style methods SCANode -> Node	Remove SCA prefix
tuscany-interface-1.4-EQUINOX-SNAPSHOT.jar	No specific changes
tuscany-interface-java-1.4-EQUINOX-SNAPSHOT.jar	Service discovery trunk changes
tuscany-interface-java-xml-1.4-EQUINOX-SNAPSHOT.jar	Monitor changes
tuscany-interface-java-jaxws-1.4-EQUINOX-SNAPSHOT.jar	Pretty much the same
tuscany-monitor-1.4-EQUINOX-SNAPSHOT.jar	Create DefaultMonitorFactory in interface package Move problem impl from assembly to here Monitor extension plugability	Use the factory pattern to create Monitor instances
tuscany-node-api-1.4-EQUINOX-SNAPSHOT.jar	Refactored, name changes
tuscany-node-launcher-1.4-EQUINOX-SNAPSHOT.jar	Much the same
tuscany-node-launcher-equinox-1.4-EQUINOX-SNAPSHOT.jar	lots of presumably Equinox specific changes	Bootstrap the Equinox runtime from classpath or distribution and run the SCA node apis
tuscany-node-impl-1.4-EQUINOX-SNAPSHOT.jar	Lots of changes. Not clear why.	Simplify the node implementation by using the Workspace to load and resolve contribution dependencies. Remove all the code to discover contributions using various methods. Now we have the ContributionLocationHelper in the node api to help find the root of the contributions.
tuscany-policy-1.4-EQUINOX-SNAPSHOT.jar	Service discovery changes
tuscany-policy-xml-1.4-EQUINOX-SNAPSHOT.jar	Some code tidying Passing in a model resolver now?
tuscany-sca-api-1.4-EQUINOX-SNAPSHOT.jar	Trunk changes
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
tuscany-xsd-1.4-EQUINOX-SNAPSHOT.jar	Public -> private
Distribution	Not two directories are alike. Pull in what we need	We now have the capability to produce distributions based on the collection of functions. The distribution structure is slightly changed to be compatible with OSGi, for example, a non-OSGi 3rd party jar now is packaged under its own folder which also contains the META-INF/MANIFEST.MF to form a folder-based OSGi bundle and leave the jar as-is.
Etc	Doesn't appear in branch	Should keep the one in trunk. It only contains a set of templates for developers, not code related
itest	There are some new itests in trunk that didn't make it into the branch	We removed the usage of SCADomain to be in favor of SCA Node APIs
samples	There are also quite a few samples that have been removed from the branch	We removed the usage of SCADomain to be in favor of SCA Node APIs
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	The eclipse plugins are now organized by functional features so that they can installed based on the needs. The current wsdl2java and java2wsdl tools are for SDO only. We added the following maven plugins: maven-bundle-plugin (renamed from maven-tuscany-bundle-plugin): Copy dependency jars into the distribution as OSGi bundles Generate Eclipse projects as PDE plugins (OSGi bundles)maven-eclipse-compiler: Compile tuscany code using Eclipse JDT (much faster than javac) Integrate with OSGi bundle resolver to report OSGi access violations (to be refactored out as a separate plugin)
tutorial	www-services is not in the branch

Current Links

Features of OSGi Enablement http://cwiki.apache.org/confluence/display/TUSCANYWIKI/OSGi+Enablement+for+Tuscany+Runtime
Overview of how Tuscany fits in with OSGi http://cwiki.apache.org/confluence/display/TUSCANY/OSGi+Aware+Programming+in+Tuscany
Devloping with Tuscany (with some points on how to bring a module into Eclipse PDE if you want to) http://tuscany.apache.org/sca-java-development-guide-osgi.html
Thoughts on how to get the branch changes merged into trunk http://cwiki.apache.org/confluence/display/TUSCANYWIKI/OASIS+Development+Stream
Presentation about hooking into Equinox http://www.eclipsecon.org/2008/sub/attachments/Equinox_Framework_How_to_get_Hooked.pdf

Older Links

http://wiki.apache.org/confluence/display/TUSCANYWIKI/OSGi+Integration