Its a merge of sca-equinox and 1x. Is there something thats missing that you can't merge in?
...ant On Fri, Feb 27, 2009 at 12:28 AM, Luciano Resende <[email protected]>wrote: > Ant > > Did you actually mean to start the implementation-bpel bringup from > the old sca-equinox branch ? I'd expect that we would use the one from > contrib that was already merged with changes from sca-equinox and 1.x; > or start from 1.x directly. > > > ---------- Forwarded message ---------- > From: <[email protected]> > Date: Tue, Feb 24, 2009 at 2:02 AM > Subject: svn commit: r747321 - in > /tuscany/java/sca/modules/implementation-bpel: ./ pom.xml > To: [email protected] > > > Author: antelder > Date: Tue Feb 24 10:02:25 2009 > New Revision: 747321 > > URL: http://svn.apache.org/viewvc?rev=747321&view=rev > Log: > Start to bring up the implementation.bpel model in 2.x > > Added: > tuscany/java/sca/modules/implementation-bpel/ (props changed) > - copied from r746974, > tuscany/branches/sca-equinox/modules/implementation-bpel/ > Modified: > tuscany/java/sca/modules/implementation-bpel/pom.xml > > Propchange: tuscany/java/sca/modules/implementation-bpel/ > > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Tue Feb 24 10:02:25 2009 > @@ -0,0 +1,18 @@ > +dojo > +target > +*.iws > +*.ipr > +*.iml > +.project > +.classpath > +derby.log > +maven.log > +velocity.log* > +junit*.properties > +surefire*.properties > +.settings > +.deployables > +.wtpmodules > +.felix > +.externalToolBuilders > +maven-eclipse.xml > > Propchange: tuscany/java/sca/modules/implementation-bpel/ > > ------------------------------------------------------------------------------ > --- svn:mergeinfo (added) > +++ svn:mergeinfo Tue Feb 24 10:02:25 2009 > @@ -0,0 +1,2 @@ > +/tuscany/branches/sca-java-1.3/modules/implementation-bpel:671193 > +/tuscany/java/sca/modules/implementation-bpel:694855 > > Modified: tuscany/java/sca/modules/implementation-bpel/pom.xml > URL: > http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/pom.xml?rev=747321&r1=746974&r2=747321&view=diff > > ============================================================================== > --- tuscany/java/sca/modules/implementation-bpel/pom.xml (original) > +++ tuscany/java/sca/modules/implementation-bpel/pom.xml Tue Feb 24 > 10:02:25 2009 > @@ -20,10 +20,10 @@ > <project> > <modelVersion>4.0.0</modelVersion> > <parent> > - <groupId>org.apache.tuscany.sca</groupId> > - <artifactId>tuscany-modules</artifactId> > - <version>1.4-EQUINOX-SNAPSHOT</version> > - <relativePath>../pom.xml</relativePath> > + <groupId>org.apache.tuscany.sca</groupId> > + <artifactId>tuscany-modules</artifactId> > + <version>2.0-SNAPSHOT</version> > + <relativePath>../pom.xml</relativePath> > </parent> > <artifactId>tuscany-implementation-bpel</artifactId> > <name>Apache Tuscany SCA BPEL Implementation Extension</name> > @@ -32,43 +32,43 @@ > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-assembly</artifactId> > - <version>1.4-EQUINOX-SNAPSHOT</version> > + <version>2.0-SNAPSHOT</version> > </dependency> > > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-assembly-xml</artifactId> > - <version>1.4-EQUINOX-SNAPSHOT</version> > + <version>2.0-SNAPSHOT</version> > </dependency> > > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-interface</artifactId> > - <version>1.4-EQUINOX-SNAPSHOT</version> > + <version>2.0-SNAPSHOT</version> > </dependency> > > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-interface-wsdl</artifactId> > - <version>1.4-EQUINOX-SNAPSHOT</version> > + <version>2.0-SNAPSHOT</version> > </dependency> > > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-interface-java</artifactId> > - <version>1.4-EQUINOX-SNAPSHOT</version> > + <version>2.0-SNAPSHOT</version> > </dependency> > > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-interface-wsdl-xml</artifactId> > - <version>1.4-EQUINOX-SNAPSHOT</version> > + <version>2.0-SNAPSHOT</version> > </dependency> > > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-databinding</artifactId> > - <version>1.4-EQUINOX-SNAPSHOT</version> > + <version>2.0-SNAPSHOT</version> > </dependency> > > <dependency> > > > > > > -- > Luciano Resende > Apache Tuscany, Apache PhotArk > http://people.apache.org/~lresende <http://people.apache.org/%7Elresende> > http://lresende.blogspot.com/ >
