Skip to content

Commit 8ae900f

Browse files
jknackjknack
committed
move all modules to a modules folder fix jooby-project#806 
1 parent 209a7ac commit 8ae900f

File tree

6,346 files changed

+223
-199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,346 files changed

+223
-199
lines changed

‎README.md‎

Lines changed: 8 additions & 3 deletions

‎jooby/src/test/java/org/jooby/ResponseTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ public void after(final After handler) {
116116
throw new UnsupportedOperationException();
117117
}
118118

119-
@Override
119+
@Override
120120
public void complete(final Complete handler) {
121-
throw new UnsupportedOperationException();
121+
throw new UnsupportedOperationException();
122122
}
123123
}
124124

@@ -258,7 +258,8 @@ public Response cookie(final Cookie.Definition cookie) {
258258
* @return
259259
*/
260260
private File file(final String location) {
261-
for (String candidate : new String[]{location, "jooby/" + location, "../jooby/" + location }) {
261+
for (String candidate : new String[]{location, "jooby/" + location,
262+
"../../jooby/" + location }) {
262263
File file = new File(candidate);
263264
if (file.exists()) {
264265
return file;

‎jooby/src/test/java/org/jooby/internal/URLAssetTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void toStr() throws Exception {
3636
assertEquals("URLAssetTest.js(application/javascript)",
3737
new URLAsset(file("src/test/resources/org/jooby/internal/URLAssetTest.js").toURI().toURL(),
3838
"URLAssetTest.js", MediaType.js)
39-
.toString());
39+
.toString());
4040
}
4141

4242
@Test
@@ -49,14 +49,14 @@ public void path() throws Exception {
4949
public void lastModified() throws Exception {
5050
assertTrue(new URLAsset(file("src/test/resources/org/jooby/internal/URLAssetTest.js").toURI()
5151
.toURL(), "URLAssetTest.js", MediaType.js)
52-
.lastModified() > 0);
52+
.lastModified() > 0);
5353
}
5454

5555
@Test
5656
public void lastModifiedFileNotFound() throws Exception {
5757
assertTrue(new URLAsset(file("src/test/resources/org/jooby/internal/URLAssetTest.missing")
5858
.toURI().toURL(), "URLAssetTest.missing", MediaType.js)
59-
.lastModified() == -1);
59+
.lastModified() == -1);
6060
}
6161

6262
@Test(expected = Exception.class)
@@ -152,15 +152,15 @@ public void type() throws Exception {
152152
assertEquals(MediaType.js,
153153
new URLAsset(file("src/test/resources/org/jooby/internal/URLAssetTest.js").toURI().toURL(),
154154
"URLAssetTest.js", MediaType.js)
155-
.type());
155+
.type());
156156
}
157157

158158
@Test
159159
public void stream() throws Exception {
160160
InputStream stream = new URLAsset(
161161
file("src/test/resources/org/jooby/internal/URLAssetTest.js").toURI().toURL(),
162162
"URLAssetTest.js", MediaType.js)
163-
.stream();
163+
.stream();
164164
assertEquals("function () {}\n", new String(ByteStreams.toByteArray(stream)));
165165
stream.close();
166166
}
@@ -183,7 +183,8 @@ public void nullType() throws Exception {
183183
* @return
184184
*/
185185
private File file(final String location) {
186-
for (String candidate : new String[]{location, "jooby/" + location, "../jooby/" + location }) {
186+
for (String candidate : new String[]{location, "jooby/" + location,
187+
"../../jooby/" + location }) {
187188
File file = new File(candidate);
188189
if (file.exists()) {
189190
return file;

‎md/jooby-pre.md‎

Lines changed: 3 additions & 3 deletions

coverage-report/pom.xml renamed to modules/coverage-report/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<parent>
66
<groupId>org.jooby</groupId>
7-
<artifactId>jooby-project</artifactId>
7+
<artifactId>modules</artifactId>
88
<version>1.2.0-SNAPSHOT</version>
99
</parent>
1010

@@ -36,7 +36,7 @@
3636
</goals>
3737
<configuration>
3838
<sources>
39-
<source>${project.parent.basedir}/jooby/src/main/java</source>
39+
<source>${project.parent.basedir}/../jooby/src/main/java</source>
4040
<source>${project.parent.basedir}/jooby-hbm/src/main/java</source>
4141
<source>${project.parent.basedir}/jooby-hbs/src/main/java</source>
4242
<source>${project.parent.basedir}/jooby-jackson/src/main/java</source>
@@ -101,7 +101,7 @@
101101
</goals>
102102
<configuration>
103103
<sources>
104-
<source>${project.parent.basedir}/jooby/src/test/java</source>
104+
<source>${project.parent.basedir}/../jooby/src/test/java</source>
105105
<source>${project.parent.basedir}/jooby-hbm/src/test/java</source>
106106
<source>${project.parent.basedir}/jooby-hbs/src/test/java</source>
107107
<source>${project.parent.basedir}/jooby-jackson/src/test/java</source>
@@ -167,7 +167,7 @@
167167
<configuration>
168168
<resources>
169169
<resource>
170-
<directory>${project.parent.basedir}/jooby/src/test/resources</directory>
170+
<directory>${project.parent.basedir}/../jooby/src/test/resources</directory>
171171
</resource>
172172
<resource>
173173
<directory>${project.parent.basedir}/jooby-assets/src/test/resources

coverage-report/src/test/java/apps/flashscope/FlashScopeApp.java renamed to modules/coverage-report/src/test/java/apps/flashscope/FlashScopeApp.java

File renamed without changes.

coverage-report/src/test/java/org/jooby/AcceptHeaderFeature.java renamed to modules/coverage-report/src/test/java/org/jooby/AcceptHeaderFeature.java

File renamed without changes.

coverage-report/src/test/java/org/jooby/AcceptHeaderIsFeature.java renamed to modules/coverage-report/src/test/java/org/jooby/AcceptHeaderIsFeature.java

File renamed without changes.

coverage-report/src/test/java/org/jooby/AssetETagFeature.java renamed to modules/coverage-report/src/test/java/org/jooby/AssetETagFeature.java

File renamed without changes.

coverage-report/src/test/java/org/jooby/AssetETagOffFeature.java renamed to modules/coverage-report/src/test/java/org/jooby/AssetETagOffFeature.java

File renamed without changes.

0 commit comments

Comments
 (0)