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 2B57618FB8 for ; Sun, 25 Oct 2015 19:38:05 +0000 (UTC) Received: (qmail 96308 invoked by uid 500); 25 Oct 2015 19:38:05 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 96269 invoked by uid 500); 25 Oct 2015 19:38:05 -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 96260 invoked by uid 99); 25 Oct 2015 19:38:05 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Oct 2015 19:38:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 847AEC04B9 for ; Sun, 25 Oct 2015 19:38:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id DdQo9bsd8aI6 for ; Sun, 25 Oct 2015 19:37:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 3530F23194 for ; Sun, 25 Oct 2015 19:37:45 +0000 (UTC) Received: (qmail 89540 invoked by uid 99); 25 Oct 2015 19:37:45 -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; Sun, 25 Oct 2015 19:37:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D488FE01FB; Sun, 25 Oct 2015 19:37:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vrozov@apache.org To: commits@apex.incubator.apache.org Date: Sun, 25 Oct 2015 19:38:02 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/36] incubator-apex-core git commit: fixing ide templates fixing ide templates 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/15ff42d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/15ff42d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/15ff42d8 Branch: refs/heads/feature-module Commit: 15ff42d8d0d7d99e47e34aab6633756f046d270c Parents: 529597f Author: Chandni Singh Authored: Mon Oct 19 23:46:11 2015 -0700 Committer: Chandni Singh Committed: Mon Oct 19 23:47:49 2015 -0700 ---------------------------------------------------------------------- .idea/codeStyleSettings.xml | 102 +++++++ 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 | 2 + 9 files changed, 464 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/.idea/codeStyleSettings.xml ---------------------------------------------------------------------- diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 0000000..d469013 --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,102 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/misc/ide-templates/eclipse/README.md ---------------------------------------------------------------------- diff --git a/misc/ide-templates/eclipse/README.md b/misc/ide-templates/eclipse/README.md new file mode 100644 index 0000000..723c6ca --- /dev/null +++ b/misc/ide-templates/eclipse/README.md @@ -0,0 +1,17 @@ +Importing APEX Code Style in Eclipse +==================================== +For Eclipse there are 2 configuration files +1. apex-style.xml : this contains Java formatter settings. +2. apex-importorder.importorder : this specifies the accepted import order for Apex projects. + +##To import Apex format style +1. On the main menu, choose Eclipse | Preferences. +2. Go to Java | Code Style | Formatter and click on 'Import'. +3. In the Import Profile dialog box that opens select the `apex-style.xml`. +4. Apply the changes. + +##To import Apex import order +1. On the main menu, choose Eclipse | Preferences. +2. Go to Java | Code Style | Organize Imports and click on 'Import'. +3. In the Load Import Order from File dialog box that opens select `apex-importorder.importorder`. +4. Apply the changes. http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/misc/ide-templates/eclipse/apex-importorder.importorder ---------------------------------------------------------------------- diff --git a/misc/ide-templates/eclipse/apex-importorder.importorder b/misc/ide-templates/eclipse/apex-importorder.importorder new file mode 100644 index 0000000..6411400 --- /dev/null +++ b/misc/ide-templates/eclipse/apex-importorder.importorder @@ -0,0 +1,10 @@ +#Organize Import Order +#Mon Oct 05 04:19:07 PDT 2015 +6= +5=com.datatorrent +4=com +3=org.apache +2=org +1=javax +0=java +7=\# http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/misc/ide-templates/eclipse/apex-style.xml ---------------------------------------------------------------------- diff --git a/misc/ide-templates/eclipse/apex-style.xml b/misc/ide-templates/eclipse/apex-style.xml new file mode 100644 index 0000000..f5d0da0 --- /dev/null +++ b/misc/ide-templates/eclipse/apex-style.xml @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/misc/ide-templates/intellij/README.md ---------------------------------------------------------------------- diff --git a/misc/ide-templates/intellij/README.md b/misc/ide-templates/intellij/README.md new file mode 100644 index 0000000..d65ab1d --- /dev/null +++ b/misc/ide-templates/intellij/README.md @@ -0,0 +1,24 @@ +Importing APEX Code Style in IntelliJ +===================================== + +With IntelliJ you can either import settings globally for all the workspaces or apply the style to a specific project. + +##Import settings globally +To share settings between all the workspaces you can import the `apex-style.jar` which contains the apex-style. + +####To import the settings from the jar archive +1. On the main menu, choose File | Import Settings. +2. In the Import File Location dialog box that opens select the `apex-style.jar`. +3. The Select Components to Import dialog box that opens next will only have an entry for code style which by default is selected. Click on OK. +4. Restart IntelliJ once the jar is successfully imported. + +####To apply APEX code style +1. On the main menu, choose IntelliJ | Preferences. +2. Go to Editor | Code Style. +3. In the 'Scheme' drop down select 'apex-style'. + +##Apply settings to a specific project +1. There is a .idea folder under the Apex project which contains a codeStyleSettings.xml that describes APEX style. +2. On the main menu of IntelliJ, choose IntelliJ | Preferences. +3. Go to Editor | Code Style. +4. In the 'Scheme' drop down select 'Project'. http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/misc/ide-templates/intellij/apex-style.jar ---------------------------------------------------------------------- diff --git a/misc/ide-templates/intellij/apex-style.jar b/misc/ide-templates/intellij/apex-style.jar new file mode 100644 index 0000000..dc71b06 Binary files /dev/null and b/misc/ide-templates/intellij/apex-style.jar differ http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/misc/ide-templates/netbeans/README.md ---------------------------------------------------------------------- diff --git a/misc/ide-templates/netbeans/README.md b/misc/ide-templates/netbeans/README.md new file mode 100644 index 0000000..f2dbfcb --- /dev/null +++ b/misc/ide-templates/netbeans/README.md @@ -0,0 +1,14 @@ +Importing APEX Code Style in NetBeans +===================================== +NetBeans supports importing settings bundled in a zip. +This directory contains apex-style.zip which contains Apex format and import order configurations. + +##To import Apex code style +1. On the main menu, choose NetBeans | Preferences. +2. In the Options dialog, click on Editor | Formatting. +3. Select the language as Java in the Language dropdown. +4. Export the current settings for backup. +5. Click on the 'Import' button which is at the bottom-left corner. +6. In the Select Options To Import dialog box that opens select the `apex-style.zip` as the import source. +7. Only formatting options are included which will be selected by default so click on OK. +8. In the Import Confirmation dialog click on OK which will restart NetBeans. http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/misc/ide-templates/netbeans/apex-style.zip ---------------------------------------------------------------------- diff --git a/misc/ide-templates/netbeans/apex-style.zip b/misc/ide-templates/netbeans/apex-style.zip new file mode 100644 index 0000000..791cc0a Binary files /dev/null and b/misc/ide-templates/netbeans/apex-style.zip differ http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/15ff42d8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 528eab4..13d5f52 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,7 @@ **/*.txt **/*.importorder **/archetype-resources/** + misc/ide-templates/** SCRIPT_STYLE @@ -190,6 +191,7 @@ **/*.md **/*.txt **/*.importorder + misc/ide-templates/**