Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 29465 invoked from network); 16 Jul 2006 10:24:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Jul 2006 10:24:26 -0000 Received: (qmail 49920 invoked by uid 500); 16 Jul 2006 10:24:26 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 49779 invoked by uid 500); 16 Jul 2006 10:24:25 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 49763 invoked by uid 99); 16 Jul 2006 10:24:25 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jul 2006 03:24:25 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jul 2006 03:22:52 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B83091A981A; Sun, 16 Jul 2006 03:21:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r422428 - in /geronimo/trunk: configs/axis-deployer/ configs/axis/ configs/client-deployer/ configs/sharedlib/ configs/unavailable-client-deployer/ configs/unavailable-ejb-deployer/ configs/unavailable-webservices-deployer/ etc/ modules/act... Date: Sun, 16 Jul 2006 10:21:51 -0000 To: scm@geronimo.apache.org From: jsisson@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060716102153.B83091A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jsisson Date: Sun Jul 16 03:21:51 2006 New Revision: 422428 URL: http://svn.apache.org/viewvc?rev=422428&view=rev Log: GERONIMO-2194 (merge from 1.1 branch) Eclipse project names not generated consistently Added: geronimo/trunk/modules/interceptor/project.properties (with props) Modified: geronimo/trunk/configs/axis-deployer/project.properties geronimo/trunk/configs/axis/project.properties geronimo/trunk/configs/client-deployer/project.properties geronimo/trunk/configs/sharedlib/project.properties geronimo/trunk/configs/unavailable-client-deployer/project.properties geronimo/trunk/configs/unavailable-ejb-deployer/project.properties geronimo/trunk/configs/unavailable-webservices-deployer/project.properties geronimo/trunk/etc/project.properties geronimo/trunk/modules/activemq-embedded-rar/project.properties Modified: geronimo/trunk/configs/axis-deployer/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis-deployer/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/configs/axis-deployer/project.properties (original) +++ geronimo/trunk/configs/axis-deployer/project.properties Sun Jul 16 03:21:51 2006 @@ -19,4 +19,8 @@ ## $Rev$ $Date$ ## +# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards) +# Also will cause all config projects to be grouped together when imported into eclipse. +maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId} + maven.multiproject.type=car Modified: geronimo/trunk/configs/axis/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/configs/axis/project.properties (original) +++ geronimo/trunk/configs/axis/project.properties Sun Jul 16 03:21:51 2006 @@ -19,6 +19,10 @@ ## $Rev$ $Date$ ## +# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards) +# Also will cause all config projects to be grouped together when imported into eclipse. +maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId} + maven.multiproject.type=car PlanHTTPPort=8080 Modified: geronimo/trunk/configs/client-deployer/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-deployer/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/configs/client-deployer/project.properties (original) +++ geronimo/trunk/configs/client-deployer/project.properties Sun Jul 16 03:21:51 2006 @@ -19,5 +19,9 @@ ## $Rev$ $Date$ ## +# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards) +# Also will cause all config projects to be grouped together when imported into eclipse. +maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId} + maven.multiproject.type=car Modified: geronimo/trunk/configs/sharedlib/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/sharedlib/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/configs/sharedlib/project.properties (original) +++ geronimo/trunk/configs/sharedlib/project.properties Sun Jul 16 03:21:51 2006 @@ -15,6 +15,10 @@ ## limitations under the License. ## +# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards) +# Also will cause all config projects to be grouped together when imported into eclipse. +maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId} + maven.multiproject.type=car Modified: geronimo/trunk/configs/unavailable-client-deployer/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-client-deployer/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/configs/unavailable-client-deployer/project.properties (original) +++ geronimo/trunk/configs/unavailable-client-deployer/project.properties Sun Jul 16 03:21:51 2006 @@ -19,5 +19,10 @@ ## $Rev$ $Date$ ## +# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards) +# Also will cause all config projects to be grouped together when imported into eclipse. +maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId} + + maven.multiproject.type=car Modified: geronimo/trunk/configs/unavailable-ejb-deployer/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-ejb-deployer/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/configs/unavailable-ejb-deployer/project.properties (original) +++ geronimo/trunk/configs/unavailable-ejb-deployer/project.properties Sun Jul 16 03:21:51 2006 @@ -19,6 +19,10 @@ ## $Rev$ $Date$ ## +# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards) +# Also will cause all config projects to be grouped together when imported into eclipse. +maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId} + maven.multiproject.type=car # just use basic GBean deployer Modified: geronimo/trunk/configs/unavailable-webservices-deployer/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-webservices-deployer/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/configs/unavailable-webservices-deployer/project.properties (original) +++ geronimo/trunk/configs/unavailable-webservices-deployer/project.properties Sun Jul 16 03:21:51 2006 @@ -19,6 +19,10 @@ ## $Rev$ $Date$ ## +# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards) +# Also will cause all config projects to be grouped together when imported into eclipse. +maven.eclipse.project.name=${geronimo.maven.eclipse.configs.project.prefix}${pom.artifactId} + maven.multiproject.type=car # just use basic GBean deployer Modified: geronimo/trunk/etc/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/etc/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/etc/project.properties (original) +++ geronimo/trunk/etc/project.properties Sun Jul 16 03:21:51 2006 @@ -219,20 +219,20 @@ ##################################################### # prefix if set would be used for all generated eclipse projects (e.g. you could place a version in here) -geronimo.maven.eclipse.project.prefix= +geronimo.maven.eclipse.project.prefix=GTrunk- # applications projects already have geronimo- as a prefix on their artifactId -geronimo.maven.eclipse.applications.project.prefix=${geronimo.maven.eclipse.project.prefix} +geronimo.maven.eclipse.applications.project.prefix=${geronimo.maven.eclipse.project.prefix}app- # assembly projects already have geronimo- as a prefix on their artifactId -geronimo.maven.eclipse.assemblies.project.prefix=${geronimo.maven.eclipse.project.prefix} +geronimo.maven.eclipse.assemblies.project.prefix=${geronimo.maven.eclipse.project.prefix}assembly- # configs projects don't have geronimo- as a prefix on their artifactId # therefore there can be conflicts with other projects (e.g. the activemq config) -geronimo.maven.eclipse.configs.project.prefix=${geronimo.maven.eclipse.project.prefix}geronimo-configs- +geronimo.maven.eclipse.configs.project.prefix=${geronimo.maven.eclipse.project.prefix}config- # modules projects already have geronimo- as a prefix on their artifactId -geronimo.maven.eclipse.modules.project.prefix=${geronimo.maven.eclipse.project.prefix} +geronimo.maven.eclipse.modules.project.prefix=${geronimo.maven.eclipse.project.prefix}module- # Note that the geronimo plugins do not use this file, so to set their eclipse project prefix # you need to set the "geronimo.maven.eclipse.plugins.project.prefix" property elsewhere. Modified: geronimo/trunk/modules/activemq-embedded-rar/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-embedded-rar/project.properties?rev=422428&r1=422427&r2=422428&view=diff ============================================================================== --- geronimo/trunk/modules/activemq-embedded-rar/project.properties (original) +++ geronimo/trunk/modules/activemq-embedded-rar/project.properties Sun Jul 16 03:21:51 2006 @@ -1,4 +1,9 @@ # ------------------------------------------------------------------- # Build Properties # ------------------------------------------------------------------- + +# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards) +# Also will cause all config projects to be grouped together when imported into eclipse. +maven.eclipse.project.name=${geronimo.maven.eclipse.modules.project.prefix}${pom.artifactId} + maven.multiproject.type=rar Added: geronimo/trunk/modules/interceptor/project.properties URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/interceptor/project.properties?rev=422428&view=auto ============================================================================== --- geronimo/trunk/modules/interceptor/project.properties (added) +++ geronimo/trunk/modules/interceptor/project.properties Sun Jul 16 03:21:51 2006 @@ -0,0 +1,6 @@ +## +## $Rev$ $Date$ +## + +# set eclipse project name (used in eclipse plugin V1.11 onwards) +maven.eclipse.project.name=${geronimo.maven.eclipse.modules.project.prefix}${pom.artifactId} Propchange: geronimo/trunk/modules/interceptor/project.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/trunk/modules/interceptor/project.properties ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/trunk/modules/interceptor/project.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain