river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dre...@apache.org
Subject svn commit: r1590727 - in /river/jtsk/skunk/qa_refactor/trunk/modularize: ./ apache-river/ apache-river/dist/ apache-river/river-dl/ apache-river/river-lib/ apache-river/river-platform/ apache-river/river-services/ apache-river/river-services/mahalo/ a...
Date Mon, 28 Apr 2014 18:00:19 GMT
Author: dreedy
Date: Mon Apr 28 18:00:18 2014
New Revision: 1590727

URL: http://svn.apache.org/r1590727
Log:
Adding initial commit for the modularization of River. This approach uses a script to load existing River jars, iterate through the contents of each jar, and copy sources to a multi-module maven project. The multi-module maven project is a start, it does not contain all the requisite River modules. It includes river-platform, river-start, river-dl, river-lib, outrigger-dl, outrigger-service, outrigger-snaplogstore, reggie-dl, reggie-service, mahalo-dl, mahalo-service, mercury-dl, mercury-service, norm-dl and norm-service

Added:
    river/jtsk/skunk/qa_refactor/trunk/modularize/
    river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy   (with props)
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/LICENSE
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/NOTICE
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/assembly.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-dl/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-dl/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-lib/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-lib/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-platform/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-platform/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-dl/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-dl/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-service/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-service/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-dl/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-dl/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-service/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-service/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-dl/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-dl/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-service/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-service/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-dl/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-dl/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-service/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-service/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-snaplogstore/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-snaplogstore/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-dl/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-dl/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-service/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-service/pom.xml
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-start/
    river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-start/pom.xml

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy Mon Apr 28 18:00:18 2014
@@ -0,0 +1,142 @@
+#!/usr/bin/env groovy
+
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+
+def jarMap = [
+        "../lib/jsk-platform.jar"           : "apache-river/river-platform",
+        "../lib/jsk-resources.jar"          : "apache-river/river-resources",
+        "../lib/start.jar"                  : "apache-river/river-start",
+        "../lib-dl/jsk-dl.jar"              : "apache-river/river-dl",
+        "../lib/serviceui.jar"              : "apache-river/river-dl",
+        "../lib/jsk-lib.jar"                : "apache-river/river-lib",
+        "../lib-dl/mahalo-dl.jar"           : "apache-river/river-services/mahalo/mahalo-dl",
+        "../lib/mahalo.jar"                 : "apache-river/river-services/mahalo/mahalo-service",
+        "../lib-dl/mercury-dl.jar"          : "apache-river/river-services/mercury/mercury-dl",
+        "../lib/mercury.jar"                : "apache-river/river-services/mercury/mercury-service",
+        "../lib-dl/norm-dl.jar"             : "apache-river/river-services/norm/norm-dl",
+        "../lib/norm.jar"                   : "apache-river/river-services/norm/norm-service",
+        "../lib-dl/outrigger-dl.jar"        : "apache-river/river-services/outrigger/outrigger-dl",
+        "../lib/outrigger.jar"              : "apache-river/river-services/outrigger/outrigger-service",
+        "../lib/outrigger-snaplogstore.jar" : "apache-river/river-services/outrigger/outrigger-snaplogstore",
+        "../lib-dl/reggie-dl.jar"           : "apache-river/river-services/reggie/reggie-dl",
+        "../lib/reggie.jar"                 : "apache-river/river-services/reggie/reggie-service"]
+
+def platform = []
+def lib = []
+def lib_dl = []
+def dlMap = [:]
+File src = new File(System.getProperty("user.dir"), "../src")
+
+for(Map.Entry<String, String> entry : jarMap.entrySet()) {
+    jar = entry.key
+    target = entry.value
+    println jar
+    ZipFile zipFile = new ZipFile(jar)
+    Enumeration zipEntries = zipFile.entries()
+    while(zipEntries.hasMoreElements()) {
+        ZipEntry zipEntry = (ZipEntry)zipEntries.nextElement()
+        if(zipEntry.getName().endsWith("MANIFEST.MF"))
+            continue
+        if(jar.contains("jsk-resources")) {
+            println "\t${zipEntry.getName()}"
+        } else {
+            if(!zipEntry.getName().contains("\$") && !zipEntry.isDirectory()) {
+                if(jar.contains("jsk-platform")) {
+                    platform << zipEntry.getName()
+                    prepAndCopy(zipFile, zipEntry, src, target)
+                } else if(jar.contains("jsk-dl") || jar.contains("serviceui")) {
+                    lib_dl << zipEntry.getName()
+                    if(skip(zipEntry, platform)) {
+                        println "\t- ${zipEntry.getName()}"
+                    } else {
+                        prepAndCopy(zipFile, zipEntry, src, target)
+                    }
+                } else if(jar.contains("jsk-lib")) {
+                    lib << zipEntry.getName()
+                    if(skip(zipEntry, platform, lib_dl)) {
+                        println "\t- ${zipEntry.getName()}"
+                    } else {
+                        prepAndCopy(zipFile, zipEntry, src, target)
+                    }
+                } else {
+                    if(jar.contains("-dl")) {
+                        String key = getKeyName(jar)
+                        dlJarClassList = dlMap.get(key)
+                        if(dlJarClassList==null)
+                            dlJarClassList = []
+                        dlJarClassList << zipEntry.name
+                        dlMap.put key, dlJarClassList
+
+                        if(skip(zipEntry, platform, lib_dl, lib)) {
+                            println "\tSkip ${zipEntry.getName()}"
+                        } else {
+                            prepAndCopy(zipFile, zipEntry, src, target)
+                        }
+                    } else {
+                        String key = getKeyName(jar)
+                        dlJarClassList = dlMap.get(key)
+                        if(skip(zipEntry, platform, lib_dl, lib, dlJarClassList as List)) {
+                            println "\tSkip ${zipEntry.getName()}"
+                        } else {
+                            prepAndCopy(zipFile, zipEntry, src, target)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+void prepAndCopy(zipFile, zipEntry, src, target) {
+    String source
+    if(zipEntry.getName().endsWith("class")) {
+        source =
+            String.format("%sjava",
+                          zipEntry.getName().substring(0, zipEntry.getName().length()-"class".length()))
+    } else if(zipEntry.getName().endsWith("PREFERRED.LIST")) {
+        iStream = zipFile.getInputStream(zipEntry)
+        //println(iStream.text)
+        println("\t"+String.format("%s/src/main/resources/PREFERRED.LIST", target))
+        iStream.close()
+        return
+    } else {
+        source = zipEntry.getName()
+    }
+    copy(src, source, String.format("%s/src/main/java/%s", target, source))
+}
+
+void copy(src, source, target) {
+    File file = new File(src, source)
+    if(file.exists()) {
+        File targetFile = new File(target)
+        File parent = targetFile.getParentFile()
+        parent.mkdirs()
+        def writer = targetFile.newWriter()
+        writer << file.text
+        writer.flush()
+        writer.close()
+        println String.format("\tcp %-100s to %s", file.path, target)
+    } else {
+        println "\tNOT FOUND: ${file.path}"
+    }
+}
+
+String getKeyName(name) {
+    int ndx = name.startsWith("../lib-dl")?10:7
+    String s = name.substring(ndx)
+    ndx = s.endsWith("-dl.jar")?7:4
+    return s.substring(0, s.length()-ndx)
+}
+
+boolean skip(ZipEntry entry, List... lists) {
+    boolean skip = false
+    for(List list : lists) {
+        if(list==null)
+            continue
+        skip = !entry.name.endsWith("PREFERRED.LIST") && list.contains(entry.name)
+        if(skip)
+            break;
+    }
+    skip
+}

Propchange: river/jtsk/skunk/qa_refactor/trunk/modularize/ModularizeRiver.groovy
------------------------------------------------------------------------------
    svn:executable = *

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/LICENSE
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/LICENSE?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/LICENSE (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/LICENSE Mon Apr 28 18:00:18 2014
@@ -0,0 +1,237 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+APACHE RIVER SUBCOMPONENTS:
+
+Apache River includes some external software components. Your use of these
+components is subject to the terms and conditions of the following licenses:
+
+ASM libraries (tools/asm-3.2.jar and tools/asm-commons-3.2.jar)
+
+   ASM: a very small and fast Java bytecode manipulation framework
+   Copyright (c) 2000-2005 INRIA, France Telecom
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. Neither the name of the copyright holders nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+   THE POSSIBILITY OF SUCH DAMAGE.

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/NOTICE
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/NOTICE?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/NOTICE (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/NOTICE Mon Apr 28 18:00:18 2014
@@ -0,0 +1,33 @@
+Apache River
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Copyright 2005 Sun Microsystems, Inc.
+This product includes material developed by Sun Microsystems, Inc.
+(http://www.sun.com).
+
+Copyright 2002-2005 Geoffrey Arnold (http://www.geoffreyarnold.com)
+This product contains code derived from the Ant build script contributed 
+to the Jini Community by Geoffrey Arnold (http://www.geoffreyarnold.com).
+
+Copyright 2000-2005 Artima Software, Inc.
+Portions of this software were developed by Bill Venners of Artima, Inc., who
+led the ServiceUI project. The ServiceUI project, which was hosted at jini.org,
+was tasked with defining a "standard" approach to attaching UIs to Jini services.
+The ServiceUI specification and API represent the best amalgamation of the ideas
+contributed by all the people who participated in the serviceui project. 
+
+The original two releases of the ServiceUI API, including specifications
+and code, are available from:
+
+    http://www.artima.com/jini/serviceui/index.html
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+This product includes the ASM library (http://asm.ow2.org/)
+
+This product includes the animal-sniffer library from codehaus.org.
+The original software is available from http://mojo.codehaus.org/animal-sniffer/
+Licensed under the MIT license.
+

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/assembly.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/assembly.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/assembly.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/assembly.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,57 @@
+<assembly>
+    <!-- We dont use the <id> element to avoid the extension to the directory
+         and zip name -->
+    <formats>
+        <format>dir</format>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>        
+        <fileSet>
+            <directory>${basedir}/..</directory>
+            <includes>
+                <include>LICENSE</include>
+                <include>NOTICE</include>
+            </includes>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <dependencySets>
+        <!-- The lib directory are service implementation jars and their transitive requirements -->
+        <dependencySet>      
+			<useProjectArtifact>false</useProjectArtifact>      
+            <excludes>  
+	            <!-- exclude jline, this is brought in transitively because of groovy -->
+                <exclude>jline:*</exclude>              
+                <exclude>groovy:*</exclude> 
+                <exclude>org.apache.river:river-dl:jar</exclude>
+	            <exclude>org.apache.river.reggie:reggie-dl:jar</exclude>
+	            <exclude>org.apache.river.outrigger:outrigger-dl:jar</exclude>
+				<exclude>org.apache.river.mahalo:mahalo-dl:jar</exclude>
+				<exclude>org.apache.river.mercury:mercury-dl:jar</exclude>
+				<exclude>org.apache.river.norm:norm-dl:jar</exclude>				
+            </excludes>
+            <outputDirectory>lib</outputDirectory>
+	    <!--<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>-->
+        </dependencySet>
+
+        <!-- All proxy and dl jars go into the lib-dl directory -->
+        <dependencySet>
+			<useProjectArtifact>false</useProjectArtifact>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+                <include>org.apache.river:river-dl:jar</include>
+                <include>org.apache.river.reggie:reggie-dl:jar</include>
+                <include>org.apache.river.outrigger:outrigger-dl:jar</include>
+				<include>org.apache.river.mahalo:mahalo-dl:jar</include>
+				<include>org.apache.river.mercury:mercury-dl:jar</include>
+				<include>org.apache.river.norm:norm-dl:jar</include>								
+            </includes>
+            <outputDirectory>lib-dl</outputDirectory>
+	    <!--<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>-->
+        </dependencySet>
+
+    </dependencySets>
+
+</assembly>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/dist/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>river</artifactId>
+        <groupId>org.apache</groupId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+	<groupId>org.apache.river</groupId>
+    <artifactId>dist</artifactId>
+    <name>River Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+       	<dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-start</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.river.reggie</groupId>
+            <artifactId>reggie-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.river.outrigger</groupId>
+            <artifactId>outrigger-snaplogstore</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.river.mahalo</groupId>
+            <artifactId>mahalo-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.river.mercury</groupId>
+            <artifactId>mercury-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.river.norm</groupId>
+            <artifactId>norm-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		
+    </dependencies>    
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
+                    <finalName>apache-river-${project.version}</finalName>
+                    <appendAssemblyId>true</appendAssemblyId>
+                    <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>        
+    </build>        
+
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <groupId>org.apache</groupId>
+    <artifactId>river</artifactId>
+    <version>3.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Apache River Project</name>
+    <description>Apache River Project</description>
+    <inceptionYear>2008</inceptionYear>
+    <url>http://incubator.apache.org/river/</url>
+
+    <licenses>
+        <license>
+            <name>Apache Software License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
+
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/browse/RIVER</url>
+    </issueManagement>
+
+    <scm>
+        <connection>scm:http://svn.apache.org/repos/asf/incubator/river/</connection>
+        <developerConnection>scm:http://svn.apache.org/repos/asf/incubator/river/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/incubator/river/</url>
+    </scm>
+
+    <ciManagement>
+        <system>hudson</system>
+        <!-- FIX URL BELOW TO POINT TO HUDSON -->
+        <url>http://incubator.apache.org/river/</url>
+    </ciManagement>
+
+    <reporting>
+        <excludeDefaults>true</excludeDefaults>
+        <plugins>        
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>modules</report>
+                            <report>cim</report>
+                            <report>issue-tracking</report>
+                            <report>mailing-list</report>
+                            <report>license</report>
+                            <report>project-team</report>
+                            <report>scm</report>
+                            <report>index</report>
+                            <!--<report>findbugs</report>-->
+                        </reports>
+                        <configuration>
+                            <aggregate>true</aggregate>
+                        </configuration>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.5</version>
+                <inherited>false</inherited>
+                <configuration><aggregate>true</aggregate></configuration>
+                <reportSets>
+                    <reportSet>
+                        <id>aggregate</id>
+                        <configuration>
+                            <links>
+                                <link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
+                                <link>https://hudson.apache.org/hudson/view/River/job/River-trunk/javadoc/api/index.html</link>
+                            </links>
+                            <detectLinks>true</detectLinks>
+                            <breakiterator>true</breakiterator>
+                            <top><![CDATA[<h2>Apache River Project ${pom.version} API Documentation</h2>]]></top>
+                            <footer><![CDATA[<i>Copyright &copy;, multiple authors.</i>]]></footer>
+                            <excludePackageNames></excludePackageNames>
+                        </configuration>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <!--
+            <plugin>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            -->
+        </plugins>
+    </reporting>
+
+    <mailingLists>
+        <mailingList>
+            <name>River User List</name>
+            <archive>river-dev@incubator.apache.org</archive>
+        </mailingList>
+        <mailingList>
+            <name>River Developer List</name>
+            <archive>river-dev@incubator.apache.org</archive>
+        </mailingList>
+        <mailingList>
+            <name>River Commits List</name>
+	        <archive>river-commits@incubator.apache.org</archive>
+        </mailingList>
+    </mailingLists>
+
+    <developers>
+        <developer>
+            <id>peter_firmstone</id>
+            <name>Peter Firmstone</name>
+            <email></email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+            <timezone>-5</timezone>
+        </developer>
+        <!-- FILL IN THE REST OF YOUR DEVELOPERS -->
+    </developers>
+
+<!--
+    <distributionManagement>
+        <repository>
+            <id></id>
+            <name></name>
+            <url>scp://</url>
+        </repository>        
+    </distributionManagement>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id></id>
+            <url></url>
+        </pluginRepository>
+    </pluginRepositories>
+-->
+	
+    <repositories>
+		<!-- Required for the use of org.cliffc.high_scale_lib.NonBlockingHashMap in river-platform -->
+        <repository>
+		    <id>boundary-site</id>
+		    <url>http://maven.boundary.com/artifactory/repo</url>
+        </repository>
+		
+        <repository>
+		    <id>hashnot</id>
+		    <url>http://mvn.hashnot.com/content/groups/public</url>
+        </repository>
+		
+    </repositories>
+	
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>${gma}</version>
+            </dependency>
+           
+        </dependencies>
+
+    </dependencyManagement>
+
+    <build>
+		<pluginManagement>
+		    <plugins>
+		        <plugin>
+		            <groupId>org.apache.maven.plugins</groupId>
+		            <artifactId>maven-jar-plugin</artifactId>
+		            <version>2.3</version>
+		        </plugin>
+
+		        <plugin>
+		            <groupId>org.apache.maven.plugins</groupId>
+		            <artifactId>maven-surefire-plugin</artifactId>
+		            <version>2.13</version>
+		        </plugin>
+
+		        <plugin>
+		            <groupId>org.apache.maven.plugins</groupId>
+		            <artifactId>maven-failsafe-plugin</artifactId>
+		            <version>2.13</version>
+		        </plugin>
+
+		        <plugin>
+		            <groupId>org.apache.maven.plugins</groupId>
+		            <artifactId>maven-source-plugin</artifactId>
+		            <version>2.1.1</version>
+		        </plugin>
+
+		        <plugin>
+		            <groupId>org.codehaus.gmaven</groupId>
+		            <artifactId>gmaven-plugin</artifactId>
+		            <version>${gmaven.version}</version>
+	            </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>2.1.1</version>
+                <inherited>false</inherited>
+                <configuration>
+                    <locales>en</locales>
+                    <outputDirectory>${basedir}/docs</outputDirectory>
+                </configuration>
+            </plugin>
+			<plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+	            <version>2.3.2</version>
+	            <configuration>
+	                <source>1.6</source>
+		            <target>1.6</target>
+		            <optimize>true</optimize>
+		            <encoding>UTF-8</encoding>
+		            <meminitial>128m</meminitial>
+		            <maxmem>1024m</maxmem>
+		        </configuration>
+		    </plugin>
+		    <plugin>
+		        <artifactId>maven-resources-plugin</artifactId>
+			    <version>2.5</version>
+		    </plugin>
+        </plugins>
+    </build>
+	
+	<properties>
+	        <groovy.version>2.2.1</groovy.version>
+	        <gmaven.version>1.4</gmaven.version>
+	        <gmavenProviderSelection>2.0</gmavenProviderSelection>
+	        <junit.version>4.8.2</junit.version>
+	        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+	    </properties>
+
+    <modules>
+	    <module>river-platform</module> 
+        <module>river-start</module>
+        <module>river-lib</module>
+        <module>river-dl</module>
+        <module>river-services/outrigger/outrigger-dl</module>
+	    <module>river-services/outrigger/outrigger-service</module>
+	    <module>river-services/outrigger/outrigger-snaplogstore</module>
+		<module>river-services/reggie/reggie-dl</module>
+        <module>river-services/reggie/reggie-service</module>
+		<module>river-services/mahalo/mahalo-dl</module>
+        <module>river-services/mahalo/mahalo-service</module>
+		<module>river-services/mercury/mercury-dl</module>
+        <module>river-services/mercury/mercury-service</module>
+		<module>river-services/norm/norm-dl</module>
+        <module>river-services/norm/norm-service</module>
+        <module>dist</module>
+  </modules>
+    
+</project>
\ No newline at end of file

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-dl/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-dl/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-dl/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-dl/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"     
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>river</artifactId>
+        <groupId>org.apache</groupId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+    </parent>
+    <groupId>org.apache.river</groupId>
+    <artifactId>river-dl</artifactId>
+    <name>Module :: River Service DL Library</name>
+    <packaging>jar</packaging>
+
+    <dependencies>       
+
+        <dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-platform</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+	    <plugins>
+			 <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+	    </plugins>
+    </build>
+
+    
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-lib/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-lib/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-lib/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-lib/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"     
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>river</artifactId>
+        <groupId>org.apache</groupId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+    </parent>
+    <groupId>org.apache.river</groupId>
+    <artifactId>river-lib</artifactId>
+    <name>Module :: River Service Library</name>
+    <packaging>jar</packaging>
+
+    <dependencies>       
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>river-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+	    <plugins>
+			 <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+	    </plugins>
+    </build>
+
+    
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-platform/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-platform/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-platform/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-platform/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"     
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>river</artifactId>
+        <groupId>org.apache</groupId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.river</groupId>
+    <artifactId>river-platform</artifactId>
+    <name>Module :: River Platform</name>
+
+     <dependencies>       
+        
+		<dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
+		
+		<dependency>
+			<groupId>au.net.Zeus</groupId> 
+			<artifactId>custard-apple</artifactId> 
+			<version>1.0.3</version>
+		</dependency>
+		
+		<dependency>
+		  <groupId>com.boundary</groupId>
+		  <artifactId>high-scale-lib</artifactId>
+		  <version>1.0.3</version>
+		</dependency>
+		
+    </dependencies>
+
+    <build>
+	    <plugins>            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <archive>                
+                        <manifestEntries>
+							<Implementation-Version>${project.version}</Implementation-Version>
+						    <Class-Path>river-resources.jar</Class-Path>
+						</manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin> 
+
+			<plugin>
+			   <groupId>org.codehaus.gmaven</groupId>
+			   <artifactId>gmaven-plugin</artifactId>
+			   <configuration>
+			        <providerSelection>${gmavenProviderSelection}</providerSelection>
+			        <source/>
+			    </configuration>
+			    <executions>
+			        <execution>
+			            <goals>
+			                <goal>generateStubs</goal>
+			                <goal>compile</goal>
+			                <goal>generateTestStubs</goal>
+			                <goal>testCompile</goal>
+			            </goals>
+			        </execution>
+			    </executions>
+			    <dependencies>
+			        <dependency>
+			            <groupId>org.codehaus.groovy</groupId>
+			            <artifactId>groovy-all</artifactId>
+			            <version>${groovy.version}</version>
+		            </dependency>
+                </dependencies>
+            </plugin>						
+
+			 <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+ 
+	    </plugins>
+    </build>
+    
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-dl/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-dl/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-dl/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-dl/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.mahalo</groupId>
+    <artifactId>mahalo-dl</artifactId>
+    <name>Module :: Mahalo Service Download classes</name> 
+   
+	<dependencies>
+        <dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-service/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-service/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-service/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mahalo/mahalo-service/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.mahalo</groupId>
+    <artifactId>mahalo-service</artifactId>
+    <name>Module :: Mahalo Service Implementation</name>    
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.river.mahalo</groupId>
+            <artifactId>mahalo-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+		<dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-dl/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-dl/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-dl/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-dl/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.mercury</groupId>
+    <artifactId>mercury-dl</artifactId>
+    <name>Module :: Mercury Service Download classes</name> 
+   
+	<dependencies>
+        <dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-service/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-service/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-service/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/mercury/mercury-service/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.mercury</groupId>
+    <artifactId>mercury-service</artifactId>
+    <name>Module :: Mercury Service Implementation</name>    
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.river.mercury</groupId>
+            <artifactId>mercury-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+		<dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-dl/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-dl/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-dl/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-dl/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.norm</groupId>
+    <artifactId>norm-dl</artifactId>
+    <name>Module :: Norm Service Download classes</name> 
+   
+	<dependencies>
+        <dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-service/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-service/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-service/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/norm/norm-service/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.norm</groupId>
+    <artifactId>norm-service</artifactId>
+    <name>Module :: Norm Service Implementation</name>    
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.river.norm</groupId>
+            <artifactId>norm-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+		<dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		
+       	<dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-start</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		
+    </dependencies>
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-dl/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-dl/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-dl/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-dl/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.outrigger</groupId>
+    <artifactId>outrigger-dl</artifactId>
+    <name>Module :: Outrigger Service Download classes</name> 
+   
+	<dependencies>
+        <dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-service/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-service/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-service/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-service/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.outrigger</groupId>
+    <artifactId>outrigger-service</artifactId>
+    <name>Module :: Outrigger Service Implementation</name>    
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.river.outrigger</groupId>
+            <artifactId>outrigger-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+		<dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-snaplogstore/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-snaplogstore/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-snaplogstore/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/outrigger/outrigger-snaplogstore/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.outrigger</groupId>
+    <artifactId>outrigger-snaplogstore</artifactId>
+    <name>Module :: Outrigger Snaplogstore</name> 
+   
+	<dependencies>
+        <dependency>
+            <groupId>org.apache.river.outrigger</groupId>
+            <artifactId>outrigger-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-dl/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-dl/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-dl/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-dl/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.reggie</groupId>
+    <artifactId>reggie-dl</artifactId>
+    <name>Module :: Reggie Service Download classes</name> 
+   
+	<dependencies>
+        <dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-service/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-service/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-service/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-services/reggie/reggie-service/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+        <artifactId>river</artifactId>
+        <version>3.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.river.reggie</groupId>
+    <artifactId>reggie-service</artifactId>
+    <name>Module :: Reggie Service Implementation</name>    
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.river.reggie</groupId>
+            <artifactId>reggie-dl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+		<dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

Added: river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-start/pom.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-start/pom.xml?rev=1590727&view=auto
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-start/pom.xml (added)
+++ river/jtsk/skunk/qa_refactor/trunk/modularize/apache-river/river-start/pom.xml Mon Apr 28 18:00:18 2014
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"     
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>river</artifactId>
+        <groupId>org.apache</groupId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.river</groupId>
+    <artifactId>river-start</artifactId>
+    <name>Module :: River Service Starter</name>
+    <packaging>jar</packaging>
+
+    <dependencies>       
+
+        <dependency>
+            <groupId>org.apache.river</groupId>
+            <artifactId>river-platform</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+	    <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <archive>                
+                        <manifestEntries>
+	                        <Main-Class>org.apache.river.start.ServiceStarter</Main-Class>
+							<Implementation-Version>${project.version}</Implementation-Version>
+						    <Class-Path>river-platform.jar</Class-Path>
+						</manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>  
+
+			 <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+	    </plugins>
+    </build>
+
+    
+</project>



Mime
View raw message