Backported release config changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-4.1@647819 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index c1d9e37..c5d39de 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1054,7 +1054,7 @@
             <artifactId>maven-deploy-plugin</artifactId>
             <inherited>true</inherited>
             <configuration>
-              <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+              <altDeploymentRepository>${staging.altRepository}/${siteId}</altDeploymentRepository>
               <updateReleaseInfo>true</updateReleaseInfo>
             </configuration>
           </plugin>
@@ -1123,7 +1123,7 @@
   </profiles>
 
   <properties>
-    <siteId>activemq</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>