Return-Path: 
 <commits-return-8450-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 22432 invoked from network); 14 Apr 2008 15:42:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 14 Apr 2008 15:42:02 -0000
Received: (qmail 26522 invoked by uid 500); 14 Apr 2008 15:42:02 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 26500 invoked by uid 500); 14 Apr 2008 15:42:02 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 26491 invoked by uid 99); 14 Apr 2008 15:42:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Apr 2008 08:42:02 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Apr 2008 15:41:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8B3081A9838; Mon, 14 Apr 2008 08:41:40 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r647857 - in /activemq/trunk: activemq-book/pom.xml
 activemq-core/pom.xml pom.xml
Date: Mon, 14 Apr 2008 15:41:39 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080414154140.8B3081A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chirino
Date: Mon Apr 14 08:41:37 2008
New Revision: 647857

URL: http://svn.apache.org/viewvc?rev=647857&view=rev
Log:
reanmed the version pom variable to activemq-version

Modified:
    activemq/trunk/activemq-book/pom.xml
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-book/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-book/pom.xml?rev=647857&r1=647856&r2=647857&view=diff
==============================================================================
--- activemq/trunk/activemq-book/pom.xml (original)
+++ activemq/trunk/activemq-book/pom.xml Mon Apr 14 08:41:37 2008
@@ -82,7 +82,7 @@
           <entities>
             <entity>
               <name>version</name>
-              <value>${version}</value>
+              <value>${activemq-version}</value>
             </entity>
           </entities>
 

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=647857&r1=647856&r2=647857&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Mon Apr 14 08:41:37 2008
@@ -591,7 +591,7 @@
         <dependency>
           <groupId>org.apache.activemq</groupId>
           <artifactId>activemq-openwire-generator</artifactId>
-          <version>${version}</version>
+          <version>${activemq-version}</version>
           <optional>true</optional>
         </dependency>
       </dependencies>
@@ -636,4 +636,4 @@
     
   </profiles>
 
-</project>
\ No newline at end of file
+</project>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=647857&r1=647856&r2=647857&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Apr 14 08:41:37 2008
@@ -30,12 +30,11 @@
   <name>ActiveMQ</name>
 
   <properties>
-    <siteId>activemq-${version}</siteId>
+    <siteId>activemq-${activemq-version}</siteId>
     <projectName>Apache ActiveMQ</projectName>
     <!-- base url for site deployment.  See distribution management for full url.  Override this in settings.xml for staging -->
     <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
-    
-    <version>${pom.version}</version>
+    <activemq-version>5.2-SNAPSHOT</activemq-version>
     <spring-version>2.5.1</spring-version>
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>
@@ -128,7 +127,7 @@
       <!-- this needs to match a server in your settings.xml with upload settings -->
       <id>activemq-website</id>
       <!-- set the staging.siteURL in your ~/.m2/settings.xml in a release or other profile -->
-      <url>${staging.siteURL}/${siteId}/maven/${version}</url>
+      <url>${staging.siteURL}/${siteId}/maven/${activemq-version}</url>
       <!--<url>${site-repo-url}</url>-->
     </site>
   </distributionManagement>
@@ -170,97 +169,97 @@
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-all</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-core</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-core</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-jaas</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-jpa-store</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-jmdns_1.0</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-xmpp</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web-demo</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web-console</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-gbean-management</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-console</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-fileserver</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-optional</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-ra</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-rar</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
         <type>rar</type>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-run</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
         <type>war</type>
       </dependency>
       <dependency>
@@ -277,7 +276,7 @@
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-openwire-generator</artifactId>
-        <version>${version}</version>
+        <version>${activemq-version}</version>
       </dependency>
 
       <!-- =============================== -->