Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1028579 [2/2] - in /activemq/activemq-apollo/trunk: ./
 apollo-website/ apollo-website/diagrams/ apollo-website/src/
 apollo-website/src/images/ apollo-website/src/main/
 apollo-website/src/main/resources/ apollo-website/src/main/scala/ apoll...
Date: Fri, 29 Oct 2010 01:21:55 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
Message-Id: <20101029012156.252F32388978@eris.apache.org>

Copied: activemq/activemq-apollo/trunk/apollo-website/src/main/webapp/styles/impact/css/site.css (from r1028330, activemq/activemq-apollo/trunk/apollo-website/src/styles/impact/css/site.css)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/main/webapp/styles/impact/css/site.css?p2=activemq/activemq-apollo/trunk/apollo-website/src/main/webapp/styles/impact/css/site.css&p1=activemq/activemq-apollo/trunk/apollo-website/src/styles/impact/css/site.css&r1=1028330&r2=1028579&rev=1028579&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/styles/impact/css/site.css (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/main/webapp/styles/impact/css/site.css Fri Oct 29 01:21:53 2010
@@ -62,8 +62,8 @@ img {
 #overview { width: 100%; padding-top:20px}
 #overview div.message { 
     font-size: 11pt; 
-    margin-top: -5px;
-    padding-left: 50px;
+    margin-top: -20px;
+    padding-left: 120px;
     width: 350px;
 }
 #overview div.message h1{ margin-bottom: 5px; display:none; }
@@ -130,6 +130,27 @@ img {
   text-align:left;
 }
 
+#blog { width: 100%; float: left; }
+#blog .wrapper { min-width: 600px; width: 600px; margin: 0 auto; }
+#blog h1 {
+  font-family: HelveticaNeue,"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif; 
+  font-size: 18pt; color: #993333;
+}
+#blog h2 {
+  border-bottom: thin dashed #DDD;
+  font-size: 16pt;
+  margin-bottom: 5px;
+}
+#blog div.post p {
+  padding-left: 10px;
+}
+#blog div.post .details {
+  padding-top: 5px;
+  color: #ccc;
+  font-size: 10pt;
+  font-family: HelveticaNeue,"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif; 
+}
+
 #content .post h2 {
   margin-bottom:5px;
 }
@@ -140,31 +161,29 @@ img {
   margin-top:0px;
 }
 
+div.compare { width: 700px; }
+div.compare div.compare-left { float:left; width:340px; padding:5px; margin-top: 15px; }
+div.compare div.compare-right { float:right; width:340px; padding:5px; margin-top: 15px; }
+div.compare div h3 {
+  margin-left: 15px;
+  padding: 5px 15px;
+  display: inline;
+  font-size: .8em;
+  color: #666;
+
+  border-top: 1px solid #ccc; -moz-border-top-colors: #ccc white white #e5e5e5;
+  border-left: 1px solid #ccc; -moz-border-left-colors: #ccc white white #e5e5e5;
+  border-right: 1px solid #ccc;-moz-border-right-colors: #ccc white white #e5e5e5;
+  border-top-left-radius: 8px; -webkit-border-top-left-radius: 8px;  -moz-border-radius-topleft: 8px;
+  border-top-right-radius: 8px; -webkit-border-top-right-radius: 8px; -moz-border-radius-topright: 8px; 
+}
+div.compare div div {
+  margin: 5px 0px 0px 0px;
+}
+
 .clear {
   clear:both;
 }
-code {	
-  font-size: .9em;
-  font-family:Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
-	font-weight:bold;
-	font-style:italic
-}
-pre {
-  background-color: #F8F8FF; 
-  
-  overflow:auto;
-  -moz-background-clip:border;
-  -moz-background-inline-policy:continuous;
-  -moz-background-origin:padding;
-  margin: 1em 0 1em 0;
-  border:1px solid #DDDDDD;
-  
-  border-top-left-radius: 8px; -webkit-border-top-left-radius: 8px; -moz-border-radius-topleft: 8px;  
-  border-top-right-radius: 8px; -webkit-border-top-right-radius: 8px; -moz-border-radius-topright: 8px;
-  border-style: solid;  border-width: 1px; border-color: #dedede !important; 
-  padding: 1em;
-}
-pre code {	
-	font-weight:normal;
-	font-style:normal
-}
+
+.wide div.compare div.compare-left { float:none; width:700px; }
+.wide div.compare div.compare-right { float:none; width:700px; }

Copied: activemq/activemq-apollo/trunk/apollo-website/src/main/webapp/versions/index.page (from r1028330, activemq/activemq-apollo/trunk/apollo-website/src/performance-scaling.page)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/main/webapp/versions/index.page?p2=activemq/activemq-apollo/trunk/apollo-website/src/main/webapp/versions/index.page&p1=activemq/activemq-apollo/trunk/apollo-website/src/performance-scaling.page&r1=1028330&r2=1028579&rev=1028579&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/performance-scaling.page (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/main/webapp/versions/index.page Fri Oct 29 01:21:53 2010
@@ -14,11 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-title: Performance and Scaling
+title: Website Versions
+in_menu: false
+sort_info: 5
 --- name:overview
 
-{project_slogan:}
+# Documentation Versions
+Website Versions
 
 --- name:content
 
-{include_file: {filename: src/performance-scaling.md, process_output: true, escape_html: false}}
+# Released Websites
+
+<!--
+* [1.0 Website](${website_base_url}/versions/1.0/website/index.html)
+* [1.0 Maven Report](${website_base_url}/versions/1.0/maven/index.html)
+ -->
+# Under Development
+
+<!-- 
+* [${project_snapshot_version} Website](${website_base_url}/versions/${project_snapshot_version}/website/index.html)
+* [${project_snapshot_version} Maven Report](${website_base_url}/versions/${project_snapshot_version}/maven/index.html)
+ -->

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1028579&r1=1028578&r2=1028579&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Oct 29 01:21:53 2010
@@ -34,13 +34,11 @@
   <properties>
 
     <!-- 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>
-    <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
+    <website-base-url>scp://people.apache.org/x1/www/activemq.apache.org/apollo</website-base-url>
 
     <target-dir>target</target-dir>
     <apollo-version>6.0-SNAPSHOT</apollo-version>
-    <siteId>apollo-${apollo-version}</siteId>
-    <projectName>Apache ActiveMQ</projectName>
+    <projectName>Apache Apollo</projectName>
 
     <!-- dependencies that track scala version changes -->
     <scala-version>2.8.0</scala-version>
@@ -107,6 +105,8 @@
     
     <jetty-version>6.1.22</jetty-version>
     <scalate-version>1.3.1</scalate-version>
+    <scalamd-version>1.2</scalamd-version>
+
     <servlet-api-version>2.5</servlet-api-version>
     <jackson-version>1.5.2</jackson-version>
     <logback-version>0.9.24</logback-version>
@@ -140,9 +140,7 @@
     <site>
       <!-- this needs to match a server in your settings.xml with upload settings -->
       <id>apollo-website</id>
-      <!-- set the staging.siteURL in your ~/.m2/settings.xml in a release or other profile -->
-      <url>${staging.siteURL}/${siteId}/maven/${apollo-version}</url>
-      <!--<url>${site-repo-url}</url>-->
+      <url>${website-base-url}/version/${project.version}/maven/</url>
     </site>
   </distributionManagement>
 
@@ -719,11 +717,6 @@
             <enabled>false</enabled>
           </snapshots>
         </repository>
-
-        <repository>
-          <id>fluido-skin</id>
-          <url>http://fluido-skin.googlecode.com/svn/repo/</url>
-        </repository>
         
         <repository>
           <id>fusesource.snapshots</id>