浏览代码

Merge pull request #654 from exercism/ex-x-java

Replace references to repo name `xjava` with references to repo name `java`
FridaTveit 9 年前
父节点
当前提交
278f79f8c0
共有 7 个文件被更改,包括 23 次插入23 次删除
  1. 7
    7
      POLICIES.md
  2. 7
    7
      README.md
  3. 1
    1
      bin/journey-test.sh
  4. 2
    2
      docs/MAINTAINING.md
  5. 3
    3
      docs/TESTS.md
  6. 1
    1
      exercises/hello-world/GETTING_STARTED.md
  7. 2
    2
      exercises/hello-world/TUTORIAL.md

+ 7
- 7
POLICIES.md 查看文件

30
 
30
 
31
 > Most (all?) exercises should be implemented in the form of instance methods since they contain "domain logic" and we (Exercism) want to encourage exemplary software.
31
 > Most (all?) exercises should be implemented in the form of instance methods since they contain "domain logic" and we (Exercism) want to encourage exemplary software.
32
 
32
 
33
-References: [[1](https://github.com/exercism/xjava/issues/177#issuecomment-261291741)]
33
+References: [[1](https://github.com/exercism/java/issues/177#issuecomment-261291741)]
34
 
34
 
35
 ### Starter implementations
35
 ### Starter implementations
36
 
36
 
40
     `throw new UnsupportedOperationException("Delete this statement and provide your own implementation.");`
40
     `throw new UnsupportedOperationException("Delete this statement and provide your own implementation.");`
41
 > - Exercises 21+: provide no stubs, but mention any "interesting" interface aspects in the HINT.md file (which gets merged into the README.md for the exercise).
41
 > - Exercises 21+: provide no stubs, but mention any "interesting" interface aspects in the HINT.md file (which gets merged into the README.md for the exercise).
42
 
42
 
43
-References: [[1](https://github.com/exercism/xjava/issues/178)]
43
+References: [[1](https://github.com/exercism/java/issues/178)]
44
 
44
 
45
 ### Do not make user-facing classes `final`
45
 ### Do not make user-facing classes `final`
46
 
46
 
50
 
50
 
51
 > All but the first test in an exercise test suite should be annotated `@Ignore("Remove to run test")` (single test) or `@Ignore("Remove to run tests")` (parametrized test).
51
 > All but the first test in an exercise test suite should be annotated `@Ignore("Remove to run test")` (single test) or `@Ignore("Remove to run tests")` (parametrized test).
52
 
52
 
53
-References: [[1](https://github.com/exercism/xjava/issues/101#issuecomment-249349204)]
53
+References: [[1](https://github.com/exercism/java/issues/101#issuecomment-249349204)]
54
 
54
 
55
 ### Multiple file submissions
55
 ### Multiple file submissions
56
 
56
 
57
 > The first exercise in the track whose test suite mandates multiple solution files should be accompanied by a HINT.md file reminding the practitioner that the CLI supports multiple file submissions.
57
 > The first exercise in the track whose test suite mandates multiple solution files should be accompanied by a HINT.md file reminding the practitioner that the CLI supports multiple file submissions.
58
 
58
 
59
-References: [[1](https://github.com/exercism/xjava/issues/365#issuecomment-292533120)]
59
+References: [[1](https://github.com/exercism/java/issues/365#issuecomment-292533120)]
60
 
60
 
61
 ### Good first patches
61
 ### Good first patches
62
 
62
 
63
-> Aim to keep 10-20 small and straightforward issues open at eny given time. Identify any such issues by applying the "Good first patch" label. You can view the current list of these issues [here](https://github.com/exercism/xjava/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+patch%22).
63
+> Aim to keep 10-20 small and straightforward issues open at eny given time. Identify any such issues by applying the "Good first patch" label. You can view the current list of these issues [here](https://github.com/exercism/java/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+patch%22).
64
 
64
 
65
-References: [[1](https://github.com/exercism/xjava/issues/220#issue-196447088)]
65
+References: [[1](https://github.com/exercism/java/issues/220#issue-196447088)]
66
 
66
 
67
 ### Simple onboarding
67
 ### Simple onboarding
68
 
68
 
69
 > The Installing Java instructions should seek to minimize the number of steps and the number of concepts a new-to-the-track practitioner needs to learn to get to coding.
69
 > The Installing Java instructions should seek to minimize the number of steps and the number of concepts a new-to-the-track practitioner needs to learn to get to coding.
70
 
70
 
71
-References: [[1](https://github.com/exercism/xjava/issues/395#issue-215734887)]
71
+References: [[1](https://github.com/exercism/java/issues/395#issue-215734887)]

+ 7
- 7
README.md 查看文件

1
-# xJava [![Build Status](https://travis-ci.org/exercism/xjava.svg?branch=master)](https://travis-ci.org/exercism/xjava) [![Join the chat at https://gitter.im/exercism/xjava](https://badges.gitter.im/exercism/xjava.svg)](https://gitter.im/exercism/xjava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1
+# java [![Build Status](https://travis-ci.org/exercism/java.svg?branch=master)](https://travis-ci.org/exercism/java) [![Join the chat at https://gitter.im/exercism/xjava](https://badges.gitter.im/exercism/java.svg)](https://gitter.im/exercism/xjava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
2
 
2
 
3
 Source for Exercism Exercises in Java.
3
 Source for Exercism Exercises in Java.
4
 
4
 
32
 1. **Ensure you have the basic Java tooling installed:**  JDK 1.8+, an editor and Gradle 2.x.
32
 1. **Ensure you have the basic Java tooling installed:**  JDK 1.8+, an editor and Gradle 2.x.
33
 
33
 
34
    (see [exercism.io: Installing Java](http://exercism.io/languages/java/installing))
34
    (see [exercism.io: Installing Java](http://exercism.io/languages/java/installing))
35
--  **Setup a branch on a fork of [exercism/xjava](https://github.com/exercism/xjava) on your computer.**
35
+-  **Setup a branch on a fork of [exercism/java](https://github.com/exercism/java) on your computer.**
36
 
36
 
37
    See [GitHub Help: Forking](https://help.github.com/articles/fork-a-repo/).  Use those instructions (in conjunction with [Exercism Contributing Guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md#git-basics)) to:
37
    See [GitHub Help: Forking](https://help.github.com/articles/fork-a-repo/).  Use those instructions (in conjunction with [Exercism Contributing Guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md#git-basics)) to:
38
    * "fork" a repository on GitHub;
38
    * "fork" a repository on GitHub;
39
    - install `git`;
39
    - install `git`;
40
    - "clone" a copy of your fork;
40
    - "clone" a copy of your fork;
41
-   - configure an "upstream remote" (in this case, `exercism/xjava`);
41
+   - configure an "upstream remote" (in this case, `exercism/java`);
42
    - create a branch to house your work
42
    - create a branch to house your work
43
 -  **Write the codes.**  Do your work on that branch you just created.
43
 -  **Write the codes.**  Do your work on that branch you just created.
44
 
44
 
59
 
59
 
60
 There are two objectives to the design of this build:
60
 There are two objectives to the design of this build:
61
 
61
 
62
-1. when a problem is built from within the xjava repo, the tests run against the "example" code (i.e. when you, the contributor, are developing the exercise);
63
-2. when a problem is built outside the xjava repo (when a participant is solving the exercise), the tests run against the "main" code.
62
+1. when a problem is built from within the `exercism/java` repo, the tests run against the "example" code (i.e. when you, the contributor, are developing the exercise);
63
+2. when a problem is built outside the `exercism/java` repo (when a participant is solving the exercise), the tests run against the "main" code.
64
 
64
 
65
 This repo is a multi-project gradle build.
65
 This repo is a multi-project gradle build.
66
 
66
 
109
 2015-09-06 15:21:01 - JSON::GeneratorError - source sequence is illegal/malformed utf-8:
109
 2015-09-06 15:21:01 - JSON::GeneratorError - source sequence is illegal/malformed utf-8:
110
 ```
110
 ```
111
 
111
 
112
-This is because some files generated by the build can't be served from the x-api.  This is by design: the CLI does not serve binaries.  To fix this, simply make sure you do a clean in your `xjava` repo before you fetch:
112
+This is because some files generated by the build can't be served from the x-api.  This is by design: the CLI does not serve binaries.  To fix this, simply make sure you do a clean in your `exercism/java` repo before you fetch:
113
 
113
 
114
 ```
114
 ```
115
-cd ~/workspace/exercism/xjava/exercises
115
+cd ~/workspace/exercism/java/exercises
116
 gradle clean
116
 gradle clean
117
 cd ~/workspace/exercism/exercises
117
 cd ~/workspace/exercism/exercises
118
 exercism fetch java bob
118
 exercism fetch java bob

+ 1
- 1
bin/journey-test.sh 查看文件

3
 # This script is shared between the Java and Kotlin tracks.  If you make an update to this script on
3
 # This script is shared between the Java and Kotlin tracks.  If you make an update to this script on
4
 # one track, please create a companion PR to merge it in to the other.  Thank you!
4
 # one track, please create a companion PR to merge it in to the other.  Thank you!
5
 TRACK=java
5
 TRACK=java
6
-TRACK_REPO="x${TRACK}"
6
+TRACK_REPO="$TRACK"
7
 TRACK_SRC_EXT="java"
7
 TRACK_SRC_EXT="java"
8
 
8
 
9
 on_exit() {
9
 on_exit() {

+ 2
- 2
docs/MAINTAINING.md 查看文件

13
 
13
 
14
 ### Track-specific
14
 ### Track-specific
15
 
15
 
16
-- [xjava](https://github.com/exercism/xjava) — yeah... you know what this one is. :)
16
+- [java](https://github.com/exercism/java) — yeah... you know what this one is. :)
17
 
17
 
18
 ### Exercism-wide
18
 ### Exercism-wide
19
 
19
 
31
 ## The Project Board
31
 ## The Project Board
32
 
32
 
33
 GitHub issues are great, but there's no way to easily set priorities.
33
 GitHub issues are great, but there's no way to easily set priorities.
34
-To do this, we're using a GitHub Project: https://github.com/exercism/xjava/projects/2.
34
+To do this, we're using a GitHub Project: https://github.com/exercism/java/projects/2.
35
 
35
 
36
 - **Epics** — issues that really represent bigger ideas.  These inspire creating a set of smaller issues to be elaborated...
36
 - **Epics** — issues that really represent bigger ideas.  These inspire creating a set of smaller issues to be elaborated...
37
 - **Icebox** — issues that just needs a little more detail to be "ready to play"...
37
 - **Icebox** — issues that just needs a little more detail to be "ready to play"...

+ 3
- 3
docs/TESTS.md 查看文件

37
    C:\Users\JohnDoe>gradle test
37
    C:\Users\JohnDoe>gradle test
38
    ```
38
    ```
39
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
39
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
40
-5. Solve the exercise.  Find and work through the `GETTING_STARTED.md` guide ([view on GitHub](https://github.com/exercism/xjava/blob/master/exercises/hello-world/GETTING_STARTED.md)).
40
+5. Solve the exercise.  Find and work through the `GETTING_STARTED.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/GETTING_STARTED.md)).
41
 
41
 
42
 
42
 
43
 Good luck!  Have fun!
43
 Good luck!  Have fun!
70
   $ gradle test
70
   $ gradle test
71
   ```
71
   ```
72
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
72
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
73
-4. Solve the exercise.  Find and work through the `GETTING_STARTED.md` guide ([view on GitHub](https://github.com/exercism/xjava/blob/master/exercises/hello-world/GETTING_STARTED.md)).
73
+4. Solve the exercise.  Find and work through the `GETTING_STARTED.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/GETTING_STARTED.md)).
74
 
74
 
75
 Good luck!  Have fun!
75
 Good luck!  Have fun!
76
 
76
 
102
   $ gradle test
102
   $ gradle test
103
   ```
103
   ```
104
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
104
    *(Don't worry about the tests failing, at first, this is how you begin each exercise.)*
105
-4. Solve the exercise.  Find and work through the `GETTING_STARTED.md` guide ([view on GitHub](https://github.com/exercism/xjava/blob/master/exercises/hello-world/GETTING_STARTED.md)).
105
+4. Solve the exercise.  Find and work through the `GETTING_STARTED.md` guide ([view on GitHub](https://github.com/exercism/java/blob/master/exercises/hello-world/GETTING_STARTED.md)).
106
 
106
 
107
 Good luck!  Have fun!
107
 Good luck!  Have fun!
108
 
108
 

+ 1
- 1
exercises/hello-world/GETTING_STARTED.md 查看文件

5
 left off.  If you haven't reviewed those instructions, do so now.
5
 left off.  If you haven't reviewed those instructions, do so now.
6
 
6
 
7
 Need more information?  A **step-by-step tutorial** is available in this directory at TUTORIAL.md or you can read 
7
 Need more information?  A **step-by-step tutorial** is available in this directory at TUTORIAL.md or you can read 
8
-the [HTML version](https://github.com/exercism/xjava/blob/master/exercises/hello-world/TUTORIAL.md).
8
+the [HTML version](https://github.com/exercism/java/blob/master/exercises/hello-world/TUTORIAL.md).
9
 
9
 
10
 The following instructions work equally well on Windows, Mac OS X and Linux.
10
 The following instructions work equally well on Windows, Mac OS X and Linux.
11
 
11
 

+ 2
- 2
exercises/hello-world/TUTORIAL.md 查看文件

1
 NOTE: You can also view the HTML version of this file here:
1
 NOTE: You can also view the HTML version of this file here:
2
-https://github.com/exercism/xjava/blob/master/exercises/hello-world/TUTORIAL.md
2
+https://github.com/exercism/java/blob/master/exercises/hello-world/TUTORIAL.md
3
 
3
 
4
 * [Solving "Hello, World!"](#solving-hello-world)
4
 * [Solving "Hello, World!"](#solving-hello-world)
5
  * [Reading Gradle output](#reading-gradle-output)
5
  * [Reading Gradle output](#reading-gradle-output)
93
 
93
 
94
 * What went wrong:
94
 * What went wrong:
95
 Execution failed for task ':test'.
95
 Execution failed for task ':test'.
96
-> There were failing tests. See the report at: file:///Users/jtigger/projects/exercism/xjava/build/exercism/java/hello-world/build/reports/tests/index.html
96
+> There were failing tests. See the report at: file:///Users/jtigger/projects/exercism/java/build/exercism/java/hello-world/build/reports/tests/index.html
97
 
97
 
98
 * Try:
98
 * Try:
99
 Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output.
99
 Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output.