flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1351228 [1/4] - in /incubator/flume/branches/flume-1262: ./ flume-ng-channels/flume-file-channel/src/site/ flume-ng-channels/flume-jdbc-channel/src/site/ flume-ng-channels/flume-recoverable-memory-channel/src/site/ flume-ng-channels/src/ f...
Date Mon, 18 Jun 2012 08:21:21 GMT
Author: rgoers
Date: Mon Jun 18 08:21:19 2012
New Revision: 1351228

URL: http://svn.apache.org/viewvc?rev=1351228&view=rev
Log:
Use normal Maven site build

Added:
    incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/
    incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/
    incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/
    incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-channels/src/
    incubator/flume/branches/flume-1262/flume-ng-channels/src/site/
    incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/
    incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-clients/src/
    incubator/flume/branches/flume-1262/flume-ng-clients/src/site/
    incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/
    incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-core/src/site/
    incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/
    incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/
    incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/
    incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/
    incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-node/src/site/
    incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/
    incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/
    incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/
    incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/
    incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml
    incubator/flume/branches/flume-1262/flume-ng-sinks/src/
    incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/
    incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml
    incubator/flume/branches/flume-1262/src/site/
    incubator/flume/branches/flume-1262/src/site/apt/
    incubator/flume/branches/flume-1262/src/site/apt/download.apt
    incubator/flume/branches/flume-1262/src/site/resources/
    incubator/flume/branches/flume-1262/src/site/resources/images/
    incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png   (with props)
    incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png   (with props)
    incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png   (with props)
    incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png   (with props)
    incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png   (with props)
    incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png   (with props)
    incubator/flume/branches/flume-1262/src/site/resources/images/flume-logo.png   (with props)
    incubator/flume/branches/flume-1262/src/site/site.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/
    incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/
    incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/index.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/legacySources.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/sinks.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/components.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/configuration.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/log4jappender.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/monitoring.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/overview.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/security.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/setup.xml
    incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/troubleshoot.xml
Removed:
    incubator/flume/branches/flume-1262/flume-ng-doc/
Modified:
    incubator/flume/branches/flume-1262/pom.xml

Added: incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="File Channel">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="JDBC Channel">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Recoverable Memory Channel">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Channels">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Log4j Appender">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Clients">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Configurations">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Flume Core">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Avro Source">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Thrift Source">
+
+  <bannerLeft>
+    <name>Apache Flume?</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Legacy Sources">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Node">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="SDK">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="HDFS Sink">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="IRC Sink">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="HBase Sink">
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>../../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,32 @@
+<!--
+ 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 name="Sinks">
+
+  <bannerLeft>
+    <name>Apache Flume?</name>
+    <src>../images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+  <body>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>
\ No newline at end of file

Modified: incubator/flume/branches/flume-1262/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/pom.xml?rev=1351228&r1=1351227&r2=1351228&view=diff
==============================================================================
--- incubator/flume/branches/flume-1262/pom.xml (original)
+++ incubator/flume/branches/flume-1262/pom.xml Mon Jun 18 08:21:19 2012
@@ -30,6 +30,7 @@ limitations under the License.
   <version>1.2.0-incubating-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Flume</name>
+  <url>http://flume.apache.org/</url>
 
   <properties>
     <!-- Set default encoding to UTF-8 to remove maven complaints -->
@@ -39,7 +40,7 @@ limitations under the License.
     <test.exclude.pattern>$</test.exclude.pattern> <!-- junk pattern -->
     <test.include.pattern>**/Test*.java</test.include.pattern>
     <siteUrlDeployment>file://people.apache.org/www/incubator.apache.org/flume</siteUrlDeployment>
-    <stagingDirectory>${project.basedir}/target/docs</stagingDirectory>
+    <!--<stagingDirectory>${project.basedir}/target/docs</stagingDirectory>  -->
 
   </properties>
 
@@ -48,11 +49,13 @@ limitations under the License.
     <module>flume-ng-configuration</module>
     <module>flume-ng-sinks</module>
     <module>flume-ng-node</module>
-    <module>flume-ng-dist</module>
     <module>flume-ng-channels</module>
     <module>flume-ng-legacy-sources</module>
     <module>flume-ng-clients</module>
     <module>flume-ng-sdk</module>
+    <!-- The test module has an implicit relationship with the distribution. This is poor practice but
+         I am not going to deal with this at the moment -->
+    <module>flume-ng-dist</module>
     <module>flume-ng-tests</module>
   </modules>
 
@@ -145,17 +148,53 @@ limitations under the License.
         <plugins>
           <plugin>
             <artifactId>maven-site-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.8.1</version>
             <executions>
               <execution>
-                <id>attach-descriptor</id>
+                <id>javadoc-jar</id>
+                <phase>package</phase>
                 <goals>
-                  <goal>attach-descriptor</goal>
+                  <goal>aggregate</goal>
                 </goals>
+                <configuration>
+                  <!-- switch on dependency-driven aggregation -->
+                  <includeDependencySources>true</includeDependencySources>
+
+                  <dependencySourceIncludes>
+                    <!-- include ONLY flume multi-module dependencies -->
+                    <dependencySourceInclude>org.apache.flume:*</dependencySourceInclude>
+                  </dependencySourceIncludes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <configuration>
+                  <skipAssembly>true</skipAssembly>
+                </configuration>
               </execution>
             </executions>
           </plugin>
         </plugins>
       </build>
+      <!-- Normally the distribution would be built during the release
+      <modules>
+        <module>flume-ng-dist</module>
+      </modules> -->
     </profile>
   </profiles>
 
@@ -232,6 +271,12 @@ limitations under the License.
       <name>Bruce Mitchener</name>
       <organization>-</organization>
     </developer>
+    <developer>
+      <email>rgoers@apache.org</email>
+      <id>rgoers@apache.org</id>
+      <name>Ralph Goers</name>
+      <organization>Intuit</organization>
+    </developer>
   </developers>
 
   <contributors>
@@ -380,37 +425,6 @@ limitations under the License.
   </distributionManagement>
 
   <build>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8.1</version>
-        <executions>
-          <execution>
-            <id>javadoc-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>aggregate</goal>
-            </goals>
-            <configuration>
-              <!-- switch on dependency-driven aggregation -->
-              <includeDependencySources>true</includeDependencySources>
-
-              <dependencySourceIncludes>
-                <!-- include ONLY flume multi-module dependencies -->
-                <dependencySourceInclude>org.apache.flume:*</dependencySourceInclude>
-              </dependencySourceIncludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
     <pluginManagement>
       <plugins>
 
@@ -443,39 +457,6 @@ limitations under the License.
         </plugin>
 
         <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <version>0.7</version>
-          <executions>
-            <execution>
-              <id>test.rat</id>
-              <phase>test</phase>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <configuration>
-                <excludes>
-                  <exclude>.git/</exclude>
-                  <exclude>.gitignore</exclude>
-                  <!-- ASF jenkins box puts the Maven repo in our root directory. -->
-                  <exclude>.repository/</exclude>
-                  <exclude>**/*.diff</exclude>
-                  <exclude>**/*.patch</exclude>
-                  <exclude>**/*.avsc</exclude>
-                  <exclude>**/docs/**</exclude>
-                </excludes>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-
-        <plugin>
-          <groupId>org.tomdz.maven</groupId>
-          <artifactId>sphinx-maven-plugin</artifactId>
-          <version>1.0.2</version>
-        </plugin>
-
-        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>2.2.2</version>
@@ -500,29 +481,17 @@ limitations under the License.
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.2.2</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>3.1</version>
           <configuration>
-            <siteDirectory>${project.basedir}/flume-ng-doc</siteDirectory>
+            <!-- <siteDirectory>${project.basedir}/flume-ng-doc</siteDirectory>  -->
           </configuration>
-          <dependencies>
-          </dependencies>
-          <executions>
-            <execution>
-              <id>flume-site</id>
-              <phase>package</phase>
-              <goals>
-                <goal>site</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>flume-site-dist</id>
-              <phase>package</phase>
-              <goals>
-                <goal>stage</goal>
-              </goals>
-            </execution>
-          </executions>
         </plugin>
 
         <plugin>
@@ -701,78 +670,78 @@ limitations under the License.
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-configuration</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-core</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-node</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-channels</groupId>
         <artifactId>flume-file-channel</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-channels</groupId>
         <artifactId>flume-jdbc-channel</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
      <dependency>
        <groupId>org.apache.flume.flume-ng-channels</groupId>
        <artifactId>flume-recoverable-memory-channel</artifactId>
-       <version>1.2.0-incubating-SNAPSHOT</version>
+       <version>${project.version}</version>
      </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-hdfs-sink</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-irc-sink</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-sinks</groupId>
         <artifactId>flume-ng-hbase-sink</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
         <artifactId>flume-thrift-source</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
         <artifactId>flume-avro-source</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-sdk</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.flume.flume-ng-clients</groupId>
         <artifactId>flume-ng-log4jappender</artifactId>
-        <version>1.2.0-incubating-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
@@ -812,31 +781,44 @@ limitations under the License.
         <reportSets>
           <reportSet>
             <reports>
+              <report>index</report>
+              <report>summary</report>
+              <report>modules</report>
+              <report>license</report>
               <report>project-team</report>
-              <report>mailing-list</report>
+              <report>scm</report>
               <report>issue-tracking</report>
-              <report>license</report>
-<!-- for now
-              <report>modules</report>
+              <report>mailing-list</report>
+              <!-- <report>dependency-management</report>
               <report>dependencies</report>
+              <report>dependency-convergence</report> -->
               <report>cim</report>
-              <report>scm</report>
--->
+              <report>plugin-management</report>
             </reports>
           </reportSet>
         </reportSets>
       </plugin>
 
       <plugin>
-        <groupId>org.tomdz.maven</groupId>
-        <artifactId>sphinx-maven-plugin</artifactId>
-        <inherited>false</inherited>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>0.8</version>
         <configuration>
-          <sourceDirectory>${project.basedir}/flume-ng-doc/sphinx</sourceDirectory>
+          <excludes>
+            <exclude>.idea/**/*</exclude>
+            <exclude>**/*.iml</exclude>
+            <exclude>.git/</exclude>
+            <exclude>.gitignore</exclude>
+            <!-- ASF jenkins box puts the Maven repo in our root directory. -->
+            <exclude>.repository/</exclude>
+            <exclude>**/*.diff</exclude>
+            <exclude>**/*.patch</exclude>
+            <exclude>**/*.avsc</exclude>
+            <exclude>**/docs/**</exclude>
+          </excludes>
         </configuration>
       </plugin>
-
     </plugins>
   </reporting>
-  
+
 </project>

Added: incubator/flume/branches/flume-1262/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/apt/download.apt?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/src/site/apt/download.apt (added)
+++ incubator/flume/branches/flume-1262/src/site/apt/download.apt Mon Jun 18 08:21:19 2012
@@ -0,0 +1,60 @@
+~~ 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.
+ ------
+Download Flume 1.2.0
+ ------
+ ------
+ ------
+
+Download Apache Flume 1.2.0
+
+  Apache Flume 1.2.0 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}.
+
+  The link in the Mirrors column should display a list of available mirrors with a
+  default selection based on your inferred location.  If you do not see that page,
+  try a different browser.  The checksum and signature are links to
+  the originals on the main distribution server.
+
+*-------------------------+---------+----------+-----------+
+|                         | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Apache Flume 1.2.0 (tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/flume/1.2.0/flume-1.2.0.tar.gz} flume-1.2.0.tar.gz}} | {{{http://www.apache.org/dist/flume/1.2.0/flume-1.2.0.tar.gz.md5} flume-1.2.0.tar.gz.md5}} | {{{http://www.apache.org/dist/flume/1.2.0/flume-1.2.0.tar.gz.asc} flume-1.2.0.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Apache Flume 1.2.0 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/flume/1.2.0/flumej-1.2.0.zip} flume-1.2.0.zip}} | {{{http://www.apache.org/dist/flume/1.2.0/flume-1.2.0.zip.md5} flume-1.2.0.zip.md5}} | {{{http://www.apache.org/dist/flume/1.2.0/flume-1.2.0.zip.asc} flume-1.2.0.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+
+    It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures.
+    Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}} for more
+    information on why you should verify our releases.
+
+    The PGP signatures can be verified using PGP or GPG. First download the {{{http://www.apache.org/dist/logging/KEYS}KEYS}}
+    as well as the asc signature file for the relevant distribution. Make sure you get these files from the
+    {{{http://www.apache.org/dist/logging/}main distribution directory}}, rather than from a mirror. Then verify the signatures using
+
+---
+% gpg --import KEYS
+% gpg --verify flume-1.2.0.tar.gz.asc
+---
+
+    Apache Flume 1.2.0 is signed by Joe Flume 1234CAFE
+
+    Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included
+    in many unix distributions.
+
+
+
+* Previous Releases
+
+  All previous releases of Apache log4j can be found in the {{{http://archive.apache.org/dist/logging/log4j}archive repository}}.

Added: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png?rev=1351228&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png?rev=1351228&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png?rev=1351228&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png?rev=1351228&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png?rev=1351228&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png?rev=1351228&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flume/branches/flume-1262/src/site/resources/images/flume-logo.png
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/flume-logo.png?rev=1351228&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/flume-logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flume/branches/flume-1262/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/site.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/src/site/site.xml (added)
+++ incubator/flume/branches/flume-1262/src/site/site.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  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 name="Flume">
+  <skin>
+    <groupId>org.apache.maven.skins</groupId>
+    <artifactId>maven-fluido-skin</artifactId>
+    <version>1.2.1</version>
+  </skin>
+
+  <custom>
+    <fluidoSkin>
+      <topBarEnabled>false</topBarEnabled>
+      <sideBarEnabled>true</sideBarEnabled>
+      <searchEnabled>true</searchEnabled>
+    </fluidoSkin>
+  </custom>
+  <!--
+  <publishDate position="right"/>
+  <version position="none"/>    -->
+
+  <bannerLeft>
+    <name>Apache Flume</name>
+    <src>images/flume-logo.png</src>
+    <href>http://flume.apache.org/</href>
+  </bannerLeft>
+
+  <body>
+    <menu name="Apache Flume" inherit="top">
+      <item name="About" href="./index.html"/>
+      <item name="Download" href="./download.html"/>
+      <item name="User's Guide" href="./usersGuide/overview.html" collapse="true">
+        <item name="Introduction" href="./usersGuide/overview.html#Introduction"/>
+        <item name="Setup" href="./usersGuide/setup.html"/>
+        <item name="Configuration" href="./usersGuide/configuration.html"/>
+        <item name="Log4j Appender" href="./usersGuide/log4jappender.html"/>
+        <item name="Security" href="./usersGuide/security.html"/>
+        <item name="Monitoring" href="./usersGuide/monitoring.html"/>
+        <item name="Troubleshooting" href="./usersGuide/troubleshoot.html"/>
+        <item name="Component Summary" href="./usersGuide/components.html"/>
+      </item>
+      <item name="Developer's Guide" href="./devGuide/overview.html" collapse="true">
+        <item name="Overview" href="./devGuide/overview.html#overview"/>
+        <item name="Architecture" href="./devGuide/overview.html#architecture"/>
+        <item name="Building" href="./devGuide/building.html"/>
+        <item name="Developing Custom Components" href="./devGuide/custom.html"/>
+      </item>
+    </menu>
+    <menu name="Components" inherit="top">
+      <item name="Channels" href="./channels.html" collapse="true">
+        <item name="File" href="flume-ng-channels/flume-file-channel/index.html"/>
+        <item name="JDBC" href="flume-ng-channels/flume-jdbc-channel/index.html"/>
+        <item name="Recoverable Memory" href="flume-ng-channels/flume-recoverable-memory-channel/index.html"/>
+      </item>
+      <item name="Clients"  href="./clients.html" collapse="true">
+        <item name="Log4j Appender" href="flume-ng-clients/flume-ng-log4jappender/index.html"/>
+      </item>
+      <item name="Configuration" href="flume-ng-configuration/index.html"/>
+      <item name="Core" href="flume-ng-core/index.html"/>
+      <item name="Legacy Sources" href="./legacySources.html" collapse="true">
+        <item name="Avro" href="flume-ng-legacy-sources/flume-avro-source/index.html"/>
+        <item name="Thrift" href="flume-ng-legacy-sources/flume-thrift-source/index.html"/>
+      </item>
+      <item name="Node" href="flume-ng-node/index.html"/>
+      <item name="SDK" href="flume-ng-sdk/index.html"/>
+      <item name="Sinks" href="./sinks.html" collapse="true">
+        <item name="HDFS" href="flume-ng-sinks/flume-hdfs-sink/index.html"/>
+        <item name="IRC" href="flume-ng-sinks/flume-irc-sink/index.html"/>
+        <item name="HBase" href="flume-ng-sinks/flume-ng-hbase-sink/index.html"/>
+      </item>
+    </menu>
+    <links>
+      <item name="Flume Wiki" href="https://cwiki.apache.org/confluence/display/FLUME/Index"/>
+      <item name="Apache" href="http://www.apache.org/"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>

Added: incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml (added)
+++ incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+    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.
+-->
+
+<document>
+  <properties>
+    <title>Apache Flume Channels</title>
+    <author email="rgoers@apache.org">Ralph Goers</author>
+  </properties>
+
+  <body>
+    <section name="Channels">
+
+      <p>
+        Flume is a distributed, reliable, and available system for efficiently
+        collecting, aggregating, and moving large amounts of log data from many
+        different sources to a centralized data store.
+      </p>
+
+
+    </section>
+
+  </body>
+</document>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml (added)
+++ incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+    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.
+-->
+
+<document>
+  <properties>
+    <title>Apache Flume Clients</title>
+    <author email="rgoers@apache.org">Ralph Goers</author>
+  </properties>
+
+  <body>
+    <section name="Clients">
+
+      <p>
+        Flume is a distributed, reliable, and available system for efficiently
+        collecting, aggregating, and moving large amounts of log data from many
+        different sources to a centralized data store.
+      </p>
+
+
+    </section>
+
+  </body>
+</document>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml (added)
+++ incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns="http://www.w3.org/TR/xhtml1/strict">
+  <properties>
+    <title>Flume 1.x Developer Guide</title>
+  </properties>
+  <body>
+    <section name="Flume 1.x Developer Guide">
+      <!-- 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. -->
+      <a name="building-flume" id="building-flume"/>
+      <subsection name="Building Flume">
+        <a name="getting-the-source" id="getting-the-source"/>
+        <h4>Getting the source</h4>
+        <p>Check out the code using Subversion. Click here for
+          <a href="http://svn.apache.org/repos/asf/incubator/flume/" id="">the SVN repository root</a>.
+        </p>
+        <p>The Flume 1.x development happens under the branch "trunk" so this command line
+          can be used:
+        </p>
+        <pre class="literal_block">svn checkout http://svn.apache.org/repos/asf/incubator/flume/trunk flume-trunk</pre>
+        <p>Alternatively, if you prefer using Git, you may use:</p>
+        <pre class="literal_block">git clone git://git.apache.org/flume.git
+          cd flume
+          git checkout trunk
+        </pre>
+        <a name="compile-test-flume" id="compile-test-flume"/>
+        <h4>Compile/test Flume</h4>
+        <p>The Flume build is mavenized. You can compile Flume using the standard Maven
+          commands:
+        </p>
+        <ol type="1">
+          <li>
+            <p>Compile only:
+              <code>mvn clean compile</code>
+            </p>
+          </li>
+          <li>
+            <p>Compile and run unit tests:
+              <code>mvn clean test</code>
+            </p>
+          </li>
+          <li>
+            <p>Run individual test(s):
+              <code>mvn clean test -Dtest=&lt;Test1&gt;,&lt;Test2&gt;,... -DfailIfNoTests=false</code>
+            </p>
+          </li>
+          <li>
+            <p>Create tarball package:
+              <code>mvn clean install</code>
+            </p>
+          </li>
+          <li>
+            <p>Create tarball package (skip unit tests):
+              <code>mvn clean install -DskipTests</code>
+            </p>
+          </li>
+        </ol>
+      </subsection>
+    </section>
+  </body>
+</document>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml (added)
+++ incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns="http://www.w3.org/TR/xhtml1/strict">
+  <properties>
+    <title>Flume 1.x Developer Guide</title>
+  </properties>
+  <body>
+    <section name="Flume 1.x Developer Guide">
+      <!-- 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. -->
+      <a name="developing-custom-components" id="developing-custom-components"/>
+      <subsection name="Developing custom components">
+        <a name="client" id="client"/>
+        <h4>Client</h4>
+        <p>The client operates at the point of origin of events and delivers them to a
+          Flume agent. Clients typically operate in the process space of the application
+          they are consuming data from. Currently flume supports Avro, log4j and syslog
+          as ways to transfer data from remote source. Additionally there’s an Exec
+          source that can consume the output of a local process as input to Flume.
+        </p>
+        <p>It’s quite possible to have a use case where these existing options are not
+          sufficient. In this case you can build a custom mechanism to send data to
+          Flume. There are two ways of achieving this. First is to create a custom client
+          that communicates to one of the flume’s existing sources like Avro or syslog.
+          Here the client should convert it’s data into messages understood by these
+          Flume sources. The other option is to write a custom Flume source that directly
+          talks to your existing client application using some IPC or RPC protocols, and
+          then convert the data into flume events to send it upstream.
+        </p>
+        <a name="client-sdk" id="client-sdk"/>
+        <h5>Client SDK</h5>
+        <p>Though flume contains a number of built in mechanisms to ingest data, often one
+          wants the ability to communicate with flume directly from a custom application.
+          The Client SDK is a library that enables applications to connect to Flume and
+          send data into Flume’s data flow over RPC.
+        </p>
+        <a name="rpc-client-interface" id="rpc-client-interface"/>
+        <h5>RPC Client interface</h5>
+        <p>The is an interface to wrap the user data data and attributes into an
+          <code>Event</code>, which is Flume’s unit of flow. This encapsulates the RPC mechanism
+          supported by Flume. The application can simply call
+          <code>append()</code>
+          or
+          <code>appendBatch()</code>
+          to send data and not worry about the underlying message
+          exchanges.
+        </p>
+        <a name="avro-rpc-client" id="avro-rpc-client"/>
+        <h5>Avro RPC Client</h5>
+        <p>As of Flume 1.1.0, Avro is the only support RPC protocol. The
+          <code>NettyAvroRpcClient</code>
+          implements the
+          <code>RpcClient</code>
+          interface. The client needs
+          to create this object with the host and port of the Flume agent and use it to
+          send data into flume. The following example shows how to use the Client SDK
+          API:
+        </p>
+        <source>
+        import org.apache.flume.Event;
+        import org.apache.flume.EventDeliveryException;
+        import org.apache.flume.FlumeException;
+        import org.apache.flume.api.RpcClient;
+        import org.apache.flume.api.RpcClientFactory;
+        import org.apache.flume.event.EventBuilder;
+
+        public void myInit () {
+          // setup the RPC connection to Flume agent at hostname/port
+          RpcClient rpcClient = RpcClientFactory.getDefaultInstance(hostname, port);
+          ...
+        }
+
+        public void sendDataToFlume(String data) {
+          // Create flume event object
+          Event event = EventBuilder.withBody(data, Charset.forName("UTF-8"));
+          try {
+            rpcClient.append(event);
+          } catch (EventDeliveryException e) {
+            // clean up and recreate rpcClient
+            rpcClient.close();
+            rpcClient = null;
+            rpcClient = RpcClientFactory.getDefaultInstance(hostname, port);
+          }
+          ...
+        }
+
+        public void cleanUp () {
+          // close the rpc connection
+          rpcClient.close();
+          ...
+        }
+        </source>
+        <a name="failover-handler" id="failover-handler"/>
+        <h5>Failover handler</h5>
+        <p>This class wraps the Avro RPC client to provide failover handling capability to
+          clients. This takes a list of host/ports of the Flume agent. If there’s an
+          error in communicating the current agent, then it automatically falls back to
+          the next agent in the list:
+        </p>
+        <source>
+          // Setup properties for the failover
+          Properties props = new Properties();
+          props.put("client.type", "default_failover");
+
+          // list of hosts
+          props.put("hosts", "host1 host2 host3");
+
+          // address/port pair for each host
+          props.put("hosts.host1", host1 + ":" + port1);
+          props.put("hosts.host1", host2 + ":" + port2);
+          props.put("hosts.host1", host3 + ":" + port3);
+
+          // create the client with failover properties
+          client = (FailoverRpcClient);
+          RpcClientFactory.getInstance(props);
+        </source>
+        <a name="transaction-interface" id="transaction-interface"/>
+        <h4>Transaction interface</h4>
+        <p>The
+          <code>Transaction</code>
+          interface is the basis of reliability for Flume. All the
+          major components ie. sources, sinks and channels needs to interface with Flume
+          transaction.
+        </p>
+        <img alt="Transaction sequence diagram" src="../images/DevGuide_image01.png"/>
+        <p>The transaction interface is implemented by a channel implementation. The
+          source and sink connected to channel obtain a transaction object. The sources
+          actually use a channel selector interface that encapsulate the transaction
+          (discussed in later sections). The operations to stage or extract an event is
+          done inside an active transaction. For example:
+        </p>
+        <source>
+          Channel ch = ...
+          Transaction tx = ch.getTransaction();
+          try {
+            tx.begin();
+            ...
+            // ch.put(event) or ch.take()
+            ...
+            tx.commit();
+          } catch (ChannelException ex) {
+            tx.rollback();
+            ...
+          } finally {
+            tx.close();
+          }
+        </source>
+        <p>Here we get hold of a transaction from a channel. After the begin method is
+          executed, the event is put in the channel and transaction is committed.
+        </p>
+        <a name="sink" id="sink"/>
+        <h4>Sink</h4>
+        <p>The purpose of a sink to extract events from the channel and forward it to the
+          next Agent in the flow or store in an external repository. A sink is linked to
+          a channel instance as per the flow configuration. There’s a sink runner thread
+          that’s get created for every configured sink which manages the sink’s
+          lifecycle. The sink needs to implement
+          <code>start()</code>
+          and
+          <code>stop()</code>
+          methods that
+          are part of the
+          <code>LifecycleAware</code>
+          interface. The
+          <code>start()</code>
+          method should
+          initialize the sink and bring it to a state where it can forward the events to
+          its next destination. The
+          <code>process()</code>
+          method from the
+          <code>Sink</code>
+          interface
+          should do the core processing of extracting the event from channel and
+          forwarding it. The
+          <code>stop()</code>
+          method should do the necessary cleanup. The sink
+          also needs to implement a
+          <code>Configurable</code>
+          interface for processing its own
+          configuration settings:
+        </p>
+        <source>
+      // foo sink
+      public class FooSink extends AbstractSink implements Configurable {
+        @Override
+        public void configure(Context context) {
+          some_Param = context.get("some_param", String.class);
+          // process some_param …
+        }
+        @Override
+        public void start() {
+          // initialize the connection to foo repository ..
+        }
+        @Override
+        public void stop () {
+          // cleanup and disconnect from foo repository ..
+        }
+        @Override
+        public Status process() throws EventDeliveryException {
+          // Start transaction
+          ch = getChannel();
+          tx = ch.getTransaction();
+          try {
+            tx.begin();
+            Event e = ch.take();
+            // send the event to foo
+            // foo.some_operation(e);
+            tx.commit();
+            sgtatus = Status.READY;
+            (ChannelException e) {
+              tx.rollback();
+              status = Status.BACKOFF;
+            } finally {
+              tx.close();
+            }
+            return status;
+          }
+        }
+      }
+
+        </source>
+        <a name="source" id="source"/>
+        <h4>Source</h4>
+        <p>The purpose of a Source is to receive data from an external client and store it
+          in the channel. As mentioned above, for sources the
+          <code>Transaction</code>
+          interface
+          is encapsulated by the<code>ChannelSelector</code>. Similar to<code>SinkRunner</code>, there’s
+          a
+          <code>SourceRunner</code>
+          thread that gets created for every configured source that
+          manages the source’s lifecycle. The source needs to implement
+          <code>start()</code>
+          and
+          <code>stop()</code>
+          methods that are part of the
+          <code>LifecycleAware</code>
+          interface. There are
+          two types of sources, pollable and event-driven. The runner of pollable source
+          runner invokes a
+          <code>process()</code>
+          method from the pollable source. The
+          <code>process()</code>
+          method should check for new data and store it in the channel. The
+          event driver source needs have its own callback mechanism that captures the new
+          data:
+        </p>
+        <source>
+      // bar source
+      public class BarSource extends AbstractSource implements Configurable, EventDrivenSource{
+        @Override
+        public void configure(Context context) {
+          some_Param = context.get("some_param", String.class);
+          // process some_param …
+        }
+        @Override
+        public void start() {
+          // initialize the connection to bar client ..
+        }
+        @Override
+        public void stop () {
+          // cleanup and disconnect from bar client ..
+        }
+        @Override
+        public Status process() throws EventDeliveryException {
+          try {
+            // receive new data
+            Event e = get_some_data();
+            // store the event to underlying channels(s)
+            getChannelProcessor().processEvent(e)
+          } catch (ChannelException ex) {
+            return Status.BACKOFF;
+          }
+          return Status.READY;
+        }
+      }
+        </source>
+        <a name="channel" id="channel"/>
+        <h4>Channel</h4>
+        <p>TBD</p>
+      </subsection>
+    </section>
+  </body>
+</document>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml (added)
+++ incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns="http://www.w3.org/TR/xhtml1/strict">
+  <properties>
+    <title>Flume 1.x Developer Guide</title>
+  </properties>
+  <body>
+    <section name="Flume 1.x Developer Guide">
+      <h2>Introduction</h2>
+      <!-- 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. -->
+      <a name="overview" id="overview"/>
+      <subsection name="Overview">
+        <p>Apache Flume is a distributed, reliable, and available system for
+          efficiently collecting, aggregating and moving large amounts of log
+          data from many different sources to a centralized data store.
+        </p>
+        <p>At the moment Flume is an incubating Apache project. There are
+          currently two release code lines available, version 0.9.x and 1.x.x. This guide
+          is specific to 1.x (more specifically 1.1.0 release). Please click here for
+          <a href="http://archive.cloudera.com/cdh/3/flume/DeveloperGuide/" id="">the Flume 0.9.x Developer Guide</a>.
+        </p>
+      </subsection>
+      <a name="architecture" id="architecture"/>
+      <subsection name="Architecture">
+        <a name="data-flow-model" id="data-flow-model"/>
+        <h4>Data flow model</h4>
+        <p>A unit of data flow is called event which is a byte payload that is accompanied
+          by an optional set of string attributes. Flume agent is a process (JVM) that
+          hosts the components that flows events from an external source to next
+          destination.
+        </p>
+        <img alt="Agent component diagram" src="../images/DevGuide_image00.png"/>
+        <p>A source consumes events delivered to it by an external source like web server
+          in a specific format. For example, an Avro source can be used to receive Avro
+          events from clients or other agents in the flow. When a source receives an
+          event, it stores it into one or more channels. The channel is a passive store
+          that keeps the event until its consumed by a sink. An example of channel is
+          the JDBC channel that uses a file-system backed embedded database. The sink
+          removes the event from channel and puts it into an external repository like
+          HDFS or forwards it to the source in next hop of the flow. The source and sink
+          within the given agent run asynchronously with the events staged in the
+          channel.
+        </p>
+        <a name="reliability" id="reliability"/>
+        <h4>Reliability</h4>
+        <p>The events are staged in the channel on each agent. Then they are delivered to
+          the next agent or terminal repository (like HDFS) in the flow. The events are
+          removed from the channel only after they are stored in the channel of next
+          agent or in the terminal repository. This is a how the single-hop message
+          delivery semantics in Flume provide end-to-end reliability of the flowFlume
+          uses transactional approach to guarantee the reliable delivery of the events.
+          The sources and sinks encapsulate the store/retrieval of the events in a
+          transaction provided by the channel. This ensures that the set of events are
+          reliably passed from point to point in the flow. In case of multi hop flow, the
+          sink on previous hop and source on next hop both have their transactions
+          running to ensure that the data is safely stored in the channel of the next
+          hop.
+        </p>
+      </subsection>
+    </section>
+  </body>
+</document>
\ No newline at end of file

Added: incubator/flume/branches/flume-1262/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/index.xml?rev=1351228&view=auto
==============================================================================
--- incubator/flume/branches/flume-1262/src/site/xdoc/index.xml (added)
+++ incubator/flume/branches/flume-1262/src/site/xdoc/index.xml Mon Jun 18 08:21:19 2012
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+    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.
+-->
+
+<document>
+  <properties>
+    <title>Apache Flume</title>
+    <author email="rgoers@apache.org">Ralph Goers</author>
+  </properties>
+
+  <body>
+    <section name="About Flume">
+
+      <p>
+        Flume is a distributed, reliable, and available system for efficiently
+        collecting, aggregating, and moving large amounts of log data from many
+        different sources to a centralized data store.
+      </p>
+
+
+    </section>
+
+    <section name="Requirements">
+      <p>
+        Flume requires Java 6.
+      </p>
+    </section>
+
+    <section name="News">
+      <p>
+        Apache Flume 1.2.0 is now available.
+      </p>
+    </section>
+
+  </body>
+</document>
\ No newline at end of file



Mime
View raw message