You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/07/07 06:41:10 UTC
svn commit: r961234 - in /activemq/sandbox/activemq-apollo-actor:
apollo-broker/ apollo-cassandra/ apollo-hawtdb/ apollo-stomp/ apollo-web/
apollo-website/ apollo-website/src/ apollo-website/src/images/
Author: chirino
Date: Wed Jul 7 04:41:10 2010
New Revision: 961234
URL: http://svn.apache.org/viewvc?rev=961234&view=rev
Log:
updating generated website doco.
Added:
activemq/sandbox/activemq-apollo-actor/apollo-website/pom.xml
activemq/sandbox/activemq-apollo-actor/apollo-website/readme.md (with props)
activemq/sandbox/activemq-apollo-actor/apollo-website/src/images/module-deps-graph.png
Removed:
activemq/sandbox/activemq-apollo-actor/apollo-website/Rakefile
Modified:
activemq/sandbox/activemq-apollo-actor/apollo-broker/pom.xml
activemq/sandbox/activemq-apollo-actor/apollo-cassandra/pom.xml
activemq/sandbox/activemq-apollo-actor/apollo-hawtdb/pom.xml
activemq/sandbox/activemq-apollo-actor/apollo-stomp/pom.xml
activemq/sandbox/activemq-apollo-actor/apollo-web/pom.xml
activemq/sandbox/activemq-apollo-actor/apollo-website/README (contents, props changed)
activemq/sandbox/activemq-apollo-actor/apollo-website/src/module-organization.page
Modified: activemq/sandbox/activemq-apollo-actor/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-broker/pom.xml?rev=961234&r1=961233&r2=961234&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-broker/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/apollo-broker/pom.xml Wed Jul 7 04:41:10 2010
@@ -48,17 +48,11 @@
<artifactId>apollo-selector</artifactId>
<version>6.0-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-hawtdb</artifactId>
<version>6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apollo-dto</artifactId>
- <version>6.0-SNAPSHOT</version>
- </dependency>
-
+ </dependency> -->
<dependency>
<groupId>org.fusesource.hawtdispatch</groupId>
Modified: activemq/sandbox/activemq-apollo-actor/apollo-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-cassandra/pom.xml?rev=961234&r1=961233&r2=961234&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-cassandra/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/apollo-cassandra/pom.xml Wed Jul 7 04:41:10 2010
@@ -58,12 +58,6 @@
<version>${hawtbuf-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apollo-dto</artifactId>
- <version>6.0-SNAPSHOT</version>
- </dependency>
-
<!-- Scala Support -->
<dependency>
<groupId>org.scala-lang</groupId>
Modified: activemq/sandbox/activemq-apollo-actor/apollo-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-hawtdb/pom.xml?rev=961234&r1=961233&r2=961234&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-hawtdb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/apollo-hawtdb/pom.xml Wed Jul 7 04:41:10 2010
@@ -51,12 +51,6 @@
<version>${hawtbuf-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apollo-dto</artifactId>
- <version>6.0-SNAPSHOT</version>
- </dependency>
-
<!-- Scala Support -->
<dependency>
<groupId>org.scala-lang</groupId>
Modified: activemq/sandbox/activemq-apollo-actor/apollo-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-stomp/pom.xml?rev=961234&r1=961233&r2=961234&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-stomp/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/apollo-stomp/pom.xml Wed Jul 7 04:41:10 2010
@@ -48,13 +48,13 @@
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-cassandra</artifactId>
<version>6.0-SNAPSHOT</version>
- <optional>true</optional>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-hawtdb</artifactId>
<version>6.0-SNAPSHOT</version>
- <optional>true</optional>
+ <scope>runtime</scope>
</dependency>
<!-- Scala Support -->
Modified: activemq/sandbox/activemq-apollo-actor/apollo-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-web/pom.xml?rev=961234&r1=961233&r2=961234&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-web/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/apollo-web/pom.xml Wed Jul 7 04:41:10 2010
@@ -43,21 +43,31 @@
<dependencies>
- <!-- ActiveMQ APIs -->
+ <!-- Core Dependency -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-broker</artifactId>
<version>6.0-SNAPSHOT</version>
</dependency>
+
+ <!-- Optional Modules -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-stomp</artifactId>
<version>6.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apollo-hawtdb</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apollo-tcp</artifactId>
+ <artifactId>apollo-cassandra</artifactId>
<version>6.0-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<!-- Web Framework APIs -->
Modified: activemq/sandbox/activemq-apollo-actor/apollo-website/README
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-website/README?rev=961234&r1=961233&r2=961234&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-website/README (original)
+++ activemq/sandbox/activemq-apollo-actor/apollo-website/README Wed Jul 7 04:41:10 2010
@@ -1,24 +1,4 @@
----
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-title: Building the Webgen Docs
----
-
-Overview
-=============================
+# Overview
We are using [webgen](http://webgen.rubyforge.org/) for generating nice HTML based documentation.
Propchange: activemq/sandbox/activemq-apollo-actor/apollo-website/README
('svn:executable' removed)
Added: activemq/sandbox/activemq-apollo-actor/apollo-website/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-website/pom.xml?rev=961234&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-website/pom.xml (added)
+++ activemq/sandbox/activemq-apollo-actor/apollo-website/pom.xml Wed Jul 7 04:41:10 2010
@@ -0,0 +1,63 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apollo-project</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>apollo-website</artifactId>
+ <name>${artifactId}</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/out</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>build-webgen</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>webgen</executable>
+ <workingDirectory>${basedir}</workingDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
Added: activemq/sandbox/activemq-apollo-actor/apollo-website/readme.md
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-website/readme.md?rev=961234&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-website/readme.md (added)
+++ activemq/sandbox/activemq-apollo-actor/apollo-website/readme.md Wed Jul 7 04:41:10 2010
@@ -0,0 +1,34 @@
+# Project Website
+
+## Overview
+
+This source module generates the project websites. It uses
+[webgen][] for to generate a static website from
+plain text files written in a wiki like notation.
+
+[webgen]:http://webgen.rubyforge.org/
+
+## Installing webgen
+
+You first need [ruby][] and [rubygems][] installed on your system. You
+should have gems version of 1.3.4 or greater. You can check this via
+
+gem --version
+
+Then you can install webgen and with all the optional features that this
+website project uses with the following command:
+
+ sudo gem install webgen coderay feedtools haml RedCloth
+
+[ruby]:http://www.ruby-lang.org/en/downloads/
+[rubygems]:http://rubygems.org/pages/download
+
+## Building the Website
+
+It's as simple as running `webgen` in the current directory. The website
+will be generated to the out directory.
+
+
+
+
+
Propchange: activemq/sandbox/activemq-apollo-actor/apollo-website/readme.md
------------------------------------------------------------------------------
svn:executable = *
Added: activemq/sandbox/activemq-apollo-actor/apollo-website/src/images/module-deps-graph.png
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-website/src/images/module-deps-graph.png?rev=961234&view=auto
==============================================================================
Files activemq/sandbox/activemq-apollo-actor/apollo-website/src/images/module-deps-graph.png (added) and activemq/sandbox/activemq-apollo-actor/apollo-website/src/images/module-deps-graph.png Wed Jul 7 04:41:10 2010 differ
Modified: activemq/sandbox/activemq-apollo-actor/apollo-website/src/module-organization.page
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apollo-website/src/module-organization.page?rev=961234&r1=961233&r2=961234&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apollo-website/src/module-organization.page (original)
+++ activemq/sandbox/activemq-apollo-actor/apollo-website/src/module-organization.page Wed Jul 7 04:41:10 2010
@@ -15,67 +15,18 @@
# limitations under the License.
title: Module Organization
---- pipeline:textile
+---
-h2. Overview
+# Module Organization
-ActiveMQ 6.x Should
+<img style="width: 70%; height: auto; display: block; margin-left: auto; margin-right: auto"
+ src="images/module-deps-graph.png" alt="dependencies graph">
-* Not conflict with ActiveMQ 5.x if it's in the CLASSPATH
-* Have a module and package structure that is OSGi friendly for extending.
-* Not depend on ActiveMQ 5.x modules
+## Updating
-h2. Modules
-
-h3. Core Modules
-
-These modules define the basic architecture and extension points of ActiveMQ 6.x. It should be a goal to keep these as small and concise as possible.
-
-Modules:
-* activemq-util: Common interfaces and utility classes
-* activemq-flow: Flow control model interfaces and implementation
-
-h3. WireFormat/Protocol Handler implementations
-
-Modules:
-* activemq-protocol: Holds the WireFormat and Protocol Handler API interfaces
-* activemq-openwire
-* activemq-stomp
-
-h3. Transport Layer implementations
-
-Modules:
-* activemq-transport: Holds Transport API defintion and VM implementation.
-* activemq-bio: Holds the blocking IO implementations
-* activemq-nio: Holds the non-blocking IO implementations
-
-h3. Dispatcher implementations
-
-Modules:
-* activemq-dispatcher : Dispatches API and default implementation
-* activemq-dispatcher-nio : Holds an NIO aware dispatcher implementation
-
-h3. Data Store implementations
-
-Modules:
-* activemq-store: Holds the Store API Definition and a memory based impelementation
-* activemq-kaha
-
-h3. Broker Service: activemq-broker
-
-Provides:
-* The APIs and implementations for configuring and starting broker instances ( via java/xml/spring etc.)
-
-h3. Client Library: activemq-client
-
-Provides:
-
-* JMS client API implementation
-
-
-h2. Packages
-
-To avoid class conflicts, we should pick a new package base. How does this sound: @org.apache.activemq.puma@ ?
+You can regenerate the above graph by running the following commands at the project root:
+ mvn -P graph graph:reactor -Dhide-transitive=true -Dhide-external=true -Dgraph.label= -Dhide-version=true -Dhide-group-id=true -Dhide-type=true
+ cp target/reactor-graph.png apollo-website/src/images/module-deps-graph.png