Merge branch 'devel-3' of https://github.com/apache/incubator-apex-core into feature-module
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/4ce1b365 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/4ce1b365 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/4ce1b365 Branch: refs/heads/feature-module Commit: 4ce1b365e246548007122a2ad493ee663aba11f5 Parents: c773c0e 7f1f81f Author: Vlad Rozov <[email protected]> Authored: Sun Oct 25 12:36:34 2015 -0700 Committer: Vlad Rozov <[email protected]> Committed: Sun Oct 25 12:36:34 2015 -0700 ---------------------------------------------------------------------- .idea/codeStyleSettings.xml | 102 +++++++ .idea/copyright/apache.xml | 6 + .idea/copyright/profiles_settings.xml | 9 + NOTICE | 6 +- README.md | 15 +- apex-app-archetype/README.md | 2 +- apex-app-archetype/pom.xml | 8 +- .../main/appended-resources/META-INF/NOTICE.vm | 3 + .../META-INF/maven/archetype-metadata.xml | 6 - .../XmlJavadocCommentsExtractor.xsl | 2 - .../main/resources/archetype-resources/pom.xml | 25 +- apex-conf-archetype/README.md | 2 +- apex-conf-archetype/pom.xml | 8 +- .../main/appended-resources/META-INF/NOTICE.vm | 3 + apex_checks.xml | 14 +- api/pom.xml | 14 +- .../main/appended-resources/META-INF/NOTICE.vm | 3 + bufferserver/pom.xml | 16 +- .../main/appended-resources/META-INF/NOTICE.vm | 3 + .../bufferserver/internal/DataList.java | 248 ++++++++++------ .../bufferserver/internal/DataListener.java | 2 +- .../bufferserver/internal/FastDataList.java | 11 +- .../bufferserver/internal/LogicalNode.java | 37 ++- .../datatorrent/bufferserver/server/Server.java | 108 +++---- common/pom.xml | 14 +- .../main/appended-resources/META-INF/NOTICE.vm | 3 + .../common/util/AsyncFSStorageAgent.java | 10 +- .../datatorrent/common/util/package-info.java | 38 +-- engine/pom.xml | 14 +- .../main/appended-resources/META-INF/NOTICE.vm | 3 + .../stram/StreamingContainerManager.java | 44 +-- .../java/com/datatorrent/stram/cli/DTCli.java | 18 +- .../com/datatorrent/stram/cli/package-info.java | 66 ++--- .../datatorrent/stram/engine/package-info.java | 94 +++--- .../com/datatorrent/stram/package-info.java | 54 ++-- .../datatorrent/stram/stream/package-info.java | 136 ++++----- .../com/datatorrent/stram/util/VersionInfo.java | 21 +- .../datatorrent/stram/util/package-info.java | 64 ++-- .../stram/webapp/asm/CompactUtil.java | 14 +- .../datatorrent/stram/webapp/package-info.java | 76 ++--- engine/src/main/scripts/dtcli | 2 +- .../com/datatorrent/stram/CheckpointTest.java | 55 ++-- .../stram/LogicalPlanModificationTest.java | 34 +-- .../datatorrent/stram/OutputUnifiedTest.java | 29 +- .../stram/StramLocalClusterTest.java | 17 +- .../datatorrent/stram/StramMiniClusterTest.java | 6 +- .../datatorrent/stram/StramRecoveryTest.java | 48 +-- .../com/datatorrent/stram/StreamCodecTest.java | 51 +--- .../stram/StreamingContainerManagerTest.java | 101 +++---- .../com/datatorrent/stram/cli/DTCliTest.java | 7 +- .../stram/client/AppPackageTest.java | 2 +- .../stram/engine/AutoMetricTest.java | 22 +- .../stram/engine/ProcessingModeTests.java | 15 +- .../stram/plan/StreamPersistanceTests.java | 27 +- .../stram/support/StramTestSupport.java | 64 +++- .../datatorrent/stram/util/VersionInfoTest.java | 12 + .../resources/testAppPackage/.dt/dt-site.xml | 39 --- .../test/resources/testAppPackage/dt-site.xml | 39 +++ .../resources/testAppPackage/mydtapp/pom.xml | 6 +- header.txt | 16 + license.txt | 16 - misc/ide-templates/eclipse/README.md | 17 ++ .../eclipse/apex-importorder.importorder | 10 + misc/ide-templates/eclipse/apex-style.xml | 295 +++++++++++++++++++ misc/ide-templates/intellij/README.md | 24 ++ misc/ide-templates/intellij/apex-style.jar | Bin 0 -> 1515 bytes misc/ide-templates/netbeans/README.md | 14 + misc/ide-templates/netbeans/apex-style.zip | Bin 0 -> 2278 bytes pom.xml | 106 +++---- 69 files changed, 1465 insertions(+), 931 deletions(-) ----------------------------------------------------------------------
