diff options
| author | James Moger <james.moger@gitblit.com> | 2014-07-03 14:21:01 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-07-03 14:21:01 -0600 |
| commit | d19549897c0c373522e29fdcf0701edfd4956ae2 (patch) | |
| tree | c1f5b9713f960f63eafdbd5a21e1613682193c84 | |
| parent | be4a85d5682754eeb0a5c91d12c6210933c6d14c (diff) | |
| parent | 6bd25df6bd0dfbc2e516ba5d392e7ba580b6eea9 (diff) | |
| download | gitblit-d19549897c0c373522e29fdcf0701edfd4956ae2.tar.gz gitblit-d19549897c0c373522e29fdcf0701edfd4956ae2.zip | |
Merged #128 "Move apt folder from 'dagger' to 'gen'"
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.moxie | 2 | ||||
| -rw-r--r-- | gitblit.iml | 2 | ||||
| -rw-r--r-- | src/main/.gitignore | 1 |
4 files changed, 4 insertions, 3 deletions
@@ -88,7 +88,7 @@ <classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" /> <classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" /> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" /> - <classpathentry kind="src" path="src/main/dagger"> + <classpathentry kind="src" path="src/main/gen"> <attributes> <attribute name="optional" value="true"/> </attributes> diff --git a/build.moxie b/build.moxie index 47556272..2f86a3c7 100644 --- a/build.moxie +++ b/build.moxie @@ -58,7 +58,7 @@ mainclass: com.gitblit.GitBlitServer sourceDirectories: - compile 'src/main/java' - compile 'src/main/bugtraq' -- compile 'src/main/dagger' apt +- compile 'src/main/gen' apt - test 'src/test/java' - test 'src/test/bugtraq' # Moxie supports one site-scoped directory for mx:doc diff --git a/gitblit.iml b/gitblit.iml index 34308aeb..5f985a5b 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -7,7 +7,7 @@ <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/bugtraq" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/dagger" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/gen" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/bugtraq" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> diff --git a/src/main/.gitignore b/src/main/.gitignore index 01c48ab2..0d046882 100644 --- a/src/main/.gitignore +++ b/src/main/.gitignore @@ -1 +1,2 @@ /dagger +/gen |