Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C814018EFA for ; Thu, 3 Mar 2016 01:33:02 +0000 (UTC) Received: (qmail 74040 invoked by uid 500); 3 Mar 2016 01:33:02 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 74003 invoked by uid 500); 3 Mar 2016 01:33:02 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 73994 invoked by uid 99); 3 Mar 2016 01:33:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2016 01:33:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 3D36A180612 for ; Thu, 3 Mar 2016 01:33:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id fVXvtUCYayso for ; Thu, 3 Mar 2016 01:33:00 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 64C055F341 for ; Thu, 3 Mar 2016 01:33:00 +0000 (UTC) Received: (qmail 73930 invoked by uid 99); 3 Mar 2016 01:32:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2016 01:32:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79A40E0577; Thu, 3 Mar 2016 01:32:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davidyan@apache.org To: commits@apex.incubator.apache.org Message-Id: <0212d951979549b597a37c3478464a60@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-apex-core git commit: Fixed EOL and manifest entries. Date: Thu, 3 Mar 2016 01:32:59 +0000 (UTC) Repository: incubator-apex-core Updated Branches: refs/heads/master 12927c95d -> c1e392385 Fixed EOL and manifest entries. 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/c1e39238 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/c1e39238 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/c1e39238 Branch: refs/heads/master Commit: c1e392385af864876738e0fb6dabc436c171e0e3 Parents: 12927c9 Author: CI Support Authored: Wed Mar 2 13:57:36 2016 -0800 Committer: Vlad Rozov Committed: Wed Mar 2 17:14:18 2016 -0800 ---------------------------------------------------------------------- .../stram/client/ConfigPackageTest.java | 6 ++-- .../testConfigPackageSrc/META-INF/MANIFEST.MF | 32 ++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c1e39238/engine/src/test/java/com/datatorrent/stram/client/ConfigPackageTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/client/ConfigPackageTest.java b/engine/src/test/java/com/datatorrent/stram/client/ConfigPackageTest.java index c09bc84..d02f3fc 100644 --- a/engine/src/test/java/com/datatorrent/stram/client/ConfigPackageTest.java +++ b/engine/src/test/java/com/datatorrent/stram/client/ConfigPackageTest.java @@ -99,9 +99,9 @@ public class ConfigPackageTest public void testConfigPackage() throws Exception { Assert.assertEquals("com.example", json.getString("appPackageGroupId")); - Assert.assertEquals("mydtapp", json.getString("appPackageName")); - Assert.assertEquals("1.0", json.getString("appPackageMinVersion")); - Assert.assertEquals("1.9999", json.getString("appPackageMaxVersion")); + Assert.assertEquals("myapexapp", json.getString("appPackageName")); + Assert.assertEquals("1.0.0", json.getString("appPackageMinVersion")); + Assert.assertEquals("1.9999.9999", json.getString("appPackageMaxVersion")); Assert.assertEquals("classpath/*", json.getJSONArray("classPath").getString(0)); Assert.assertEquals("files/*", json.getJSONArray("files").getString(0)); } http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c1e39238/engine/src/test/resources/testConfigPackage/testConfigPackageSrc/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/engine/src/test/resources/testConfigPackage/testConfigPackageSrc/META-INF/MANIFEST.MF b/engine/src/test/resources/testConfigPackage/testConfigPackageSrc/META-INF/MANIFEST.MF index 7edd658..c576ae0 100644 --- a/engine/src/test/resources/testConfigPackage/testConfigPackageSrc/META-INF/MANIFEST.MF +++ b/engine/src/test/resources/testConfigPackage/testConfigPackageSrc/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ -Manifest-Version: 1.0 -Archiver-Version: Plexus Archiver -Created-By: Apache Maven -Built-By: dtdeveloper -Build-Jdk: 1.6.0_45 -DT-App-Package-Max-Version: 1.9999 -DT-App-Package-Min-Version: 1.0 -DT-App-Package-Group-Id: com.example -DT-App-Package-Name: mydtapp -DT-Conf-Package-Description: My DataTorrent Application Configuration - Description -DT-Conf-Package-Display-Name: My DataTorrent Application Configuration -DT-Conf-Package-Name: mydtconf -Files: files/* -Class-Path: classpath/* - +Manifest-Version: 1.0 +Archiver-Version: Plexus Archiver +Created-By: Apache Maven +Built-By: dtdeveloper +Build-Jdk: 1.7.0_80 +DT-App-Package-Max-Version: 1.9999.9999 +DT-App-Package-Min-Version: 1.0.0 +DT-App-Package-Group-Id: com.example +DT-App-Package-Name: myapexapp +DT-Conf-Package-Description: My Apex Application Configuration Descrip + tion +DT-Conf-Package-Display-Name: My Apex Application Configuration +DT-Conf-Package-Name: myapex +Files: files/* +Class-Path: classpath/* +