On Wed, Mar 30, 2011 at 7:09 AM, <[email protected]> wrote: > Author: lresende > Date: Wed Mar 30 06:09:42 2011 > New Revision: 1086849 > > URL: http://svn.apache.org/viewvc?rev=1086849&view=rev > Log: > Starting to port store sample to next release > > Added: > tuscany/sca-java-2.x/trunk/samples/applications/ > tuscany/sca-java-2.x/trunk/samples/applications/pom.xml (contents, props > changed) > - copied, changed from r1086841, > tuscany/sca-java-2.x/contrib/samples/applications/pom.xml > tuscany/sca-java-2.x/trunk/samples/applications/store/ (props changed) > - copied from r1086841, > tuscany/sca-java-2.x/contrib/samples/applications/store/ > Modified: > tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml > > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml > > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml > tuscany/sca-java-2.x/trunk/samples/getting-started/pom.xml > tuscany/sca-java-2.x/trunk/samples/pom.xml > > Copied: tuscany/sca-java-2.x/trunk/samples/applications/pom.xml (from > r1086841, tuscany/sca-java-2.x/contrib/samples/applications/pom.xml) > URL: > http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/applications/pom.xml?p2=tuscany/sca-java-2.x/trunk/samples/applications/pom.xml&p1=tuscany/sca-java-2.x/contrib/samples/applications/pom.xml&r1=1086841&r2=1086849&rev=1086849&view=diff > ============================================================================== > --- tuscany/sca-java-2.x/contrib/samples/applications/pom.xml (original) > +++ tuscany/sca-java-2.x/trunk/samples/applications/pom.xml Wed Mar 30 > 06:09:42 2011 > @@ -24,22 +24,13 @@ > <artifactId>tuscany-samples</artifactId> > <version>2.0-SNAPSHOT</version> > </parent> > + > <artifactId>tuscany-samples-applications</artifactId> > - <groupId>org.apache.tuscany.sca</groupId> > + <version>2.0-SNAPSHOT</version> > <packaging>pom</packaging> > <name>Apache Tuscany Sample Applications</name> > > - <profiles> > - <profile> > - <id>default</id> > - <activation> > - <activeByDefault>true</activeByDefault> > - </activation> > - <modules> > - <module>logging-scribe</module> > - <module>store</module> > - <module>store-webapp</module> > - </modules> > - </profile> > - </profiles> > + <modules> > + <module>store</module> > + </modules> > </project> > > Propchange: tuscany/sca-java-2.x/trunk/samples/applications/pom.xml > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: tuscany/sca-java-2.x/trunk/samples/applications/pom.xml > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Propchange: tuscany/sca-java-2.x/trunk/samples/applications/pom.xml > ------------------------------------------------------------------------------ > --- svn:mergeinfo (added) > +++ svn:mergeinfo Wed Mar 30 06:09:42 2011 > @@ -0,0 +1 @@ > +/tuscany/branches/sca-java-1.3/samples/applications/pom.xml:671193 > > Propchange: tuscany/sca-java-2.x/trunk/samples/applications/store/ > ------------------------------------------------------------------------------ > --- svn:ignore (added) > +++ svn:ignore Wed Mar 30 06:09:42 2011 > @@ -0,0 +1,20 @@ > +target > +work > +dojo > +*.iws > +*.ipr > +*.iml > +derby.log > +maven.log > +maven-eclipse.xml > +build.xml > +build-dependency.xml > +velocity.log* > +junit*.properties > +surefire*.properties > +.project > +.classpath > +.settings > +.deployables > +.wtpmodules > +.externalToolBuilders > > Propchange: tuscany/sca-java-2.x/trunk/samples/applications/store/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (added) > +++ svn:mergeinfo Wed Mar 30 06:09:42 2011 > @@ -0,0 +1 @@ > +/tuscany/branches/sca-java-1.3/samples/applications/store:671193 > > Modified: tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml > URL: > http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml?rev=1086849&r1=1086841&r2=1086849&view=diff > ============================================================================== > --- tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml (original) > +++ tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml Wed Mar 30 > 06:09:42 2011 > @@ -23,7 +23,6 @@ > <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-samples</artifactId> > <version>2.0-SNAPSHOT</version> > - <relativePath>../../pom.xml</relativePath> > </parent> > <artifactId>sample-store</artifactId> > <name>Apache Tuscany SCA Sample Getting Started Online Store</name> > > Modified: > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml > URL: > http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml?rev=1086849&r1=1086848&r2=1086849&view=diff > ============================================================================== > --- > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml > (original) > +++ > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-scaclient/pom.xml > Wed Mar 30 06:09:42 2011 > @@ -22,7 +22,7 @@ > <modelVersion>4.0.0</modelVersion> > > <parent> > - <groupId>org.apache.tuscany.sca.samples</groupId> > + <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-samples</artifactId> > <version>2.0-SNAPSHOT</version> > <relativePath/> > > Modified: > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml > URL: > http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml?rev=1086849&r1=1086848&r2=1086849&view=diff > ============================================================================== > --- > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml > (original) > +++ > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml > Wed Mar 30 06:09:42 2011 > @@ -22,7 +22,7 @@ > <modelVersion>4.0.0</modelVersion> > > <parent> > - <groupId>org.apache.tuscany.sca.samples</groupId> > + <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-samples</artifactId> > <version>2.0-SNAPSHOT</version> > <relativePath/> > > Modified: > tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml > URL: > http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml?rev=1086849&r1=1086848&r2=1086849&view=diff > ============================================================================== > --- tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml > (original) > +++ tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld/pom.xml Wed > Mar 30 06:09:42 2011 > @@ -22,7 +22,7 @@ > <modelVersion>4.0.0</modelVersion> > > <parent> > - <groupId>org.apache.tuscany.sca.samples</groupId> > + <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-samples</artifactId> > <version>2.0-SNAPSHOT</version> > <relativePath/> > > Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/pom.xml > URL: > http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/pom.xml?rev=1086849&r1=1086848&r2=1086849&view=diff > ============================================================================== > --- tuscany/sca-java-2.x/trunk/samples/getting-started/pom.xml (original) > +++ tuscany/sca-java-2.x/trunk/samples/getting-started/pom.xml Wed Mar 30 > 06:09:42 2011 > @@ -20,7 +20,7 @@ > <project> > <modelVersion>4.0.0</modelVersion> > <parent> > - <groupId>org.apache.tuscany.sca.samples</groupId> > + <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-samples</artifactId> > <version>2.0-SNAPSHOT</version> > </parent> > > Modified: tuscany/sca-java-2.x/trunk/samples/pom.xml > URL: > http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/pom.xml?rev=1086849&r1=1086848&r2=1086849&view=diff > ============================================================================== > --- tuscany/sca-java-2.x/trunk/samples/pom.xml (original) > +++ tuscany/sca-java-2.x/trunk/samples/pom.xml Wed Mar 30 06:09:42 2011 > @@ -26,12 +26,12 @@ > </parent> > > <artifactId>tuscany-samples</artifactId> > - <groupId>org.apache.tuscany.sca.samples</groupId> > <version>2.0-SNAPSHOT</version> > <packaging>pom</packaging> > <name>Apache Tuscany SCA Samples</name> > > <modules> > + <module>applications</module> > <module>getting-started</module> > </modules> > >
In this commit you've also changed the Maven groupid of the existing samples from org.apache.tuscany.sca.samples to org.apache.tuscany.sca. They were intentionally using org.apache.tuscany.sca.samples to keep them separate so i'd like to keep that, is there any reason not to do that? ...ant
