diff options
| -rw-r--r-- | build.xml | 14 | ||||
| -rw-r--r-- | src/com/gitblit/Launcher.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/build/Build.java (renamed from src/com/gitblit/Build.java) | 3 | ||||
| -rw-r--r-- | src/com/gitblit/build/BuildSite.java (renamed from src/com/gitblit/BuildSite.java) | 3 | ||||
| -rw-r--r-- | src/com/gitblit/build/BuildThumbnails.java (renamed from src/com/gitblit/BuildThumbnails.java) | 2 | ||||
| -rw-r--r-- | src/com/gitblit/build/BuildWebXml.java (renamed from src/com/gitblit/BuildWebXml.java) | 4 |
6 files changed, 17 insertions, 11 deletions
@@ -83,11 +83,11 @@ <delete dir="${project.build.dir}" />
<mkdir dir="${project.build.dir}" />
<javac srcdir="${basedir}/src" destdir="${project.build.dir}">
- <include name="com/gitblit/Build.java" />
+ <include name="com/gitblit/build/Build.java" />
<include name="com/gitblit/Constants.java" />
<include name="com/gitblit/utils/StringUtils.java" />
</javac>
- <java classpath="${project.build.dir}" classname="com.gitblit.Build" />
+ <java classpath="${project.build.dir}" classname="com.gitblit.build.Build" />
<!-- Compile Project -->
<path id="master-classpath">
@@ -193,7 +193,7 @@ </copy>
<!-- Build deployment doc pages -->
- <java classpath="${project.build.dir}" classname="com.gitblit.BuildSite">
+ <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildSite">
<classpath refid="master-classpath" />
<arg value="--sourceFolder" />
<arg value="${basedir}/docs" />
@@ -268,7 +268,7 @@ </antcall>
<!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties -->
- <java classpath="${project.build.dir}" classname="com.gitblit.BuildWebXml">
+ <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml">
<classpath refid="master-classpath" />
<arg value="--sourceFile" />
@@ -307,7 +307,7 @@ <fileset dir="${project.build.dir}">
<exclude name="WEB-INF/web.xml" />
<exclude name="com/gitblit/tests/" />
- <exclude name="com/gitblit/Build*.class" />
+ <exclude name="com/gitblit/build/**" />
<exclude name="com/gitblit/GitBlitServer*.class" />
<exclude name="com/gitblit/Launcher*.class" />
<exclude name="com/gitblit/MakeCertificate*.class" />
@@ -372,7 +372,7 @@ </copy>
<!-- Generate thumbnails of screenshots -->
- <java classpath="${project.build.dir}" classname="com.gitblit.BuildThumbnails">
+ <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildThumbnails">
<classpath refid="master-classpath" />
<arg value="--sourceFolder" />
@@ -394,7 +394,7 @@ </copy>
<!-- Build site pages -->
- <java classpath="${project.build.dir}" classname="com.gitblit.BuildSite">
+ <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildSite">
<classpath refid="master-classpath" />
<arg value="--sourceFolder" />
<arg value="${basedir}/docs" />
diff --git a/src/com/gitblit/Launcher.java b/src/com/gitblit/Launcher.java index 0dcb22ba..7865f244 100644 --- a/src/com/gitblit/Launcher.java +++ b/src/com/gitblit/Launcher.java @@ -27,6 +27,8 @@ import java.util.ArrayList; import java.util.Arrays;
import java.util.List;
+import com.gitblit.build.Build;
+
/**
* Launch helper class that adds all jars found in the local "lib" folder and
* then calls the application main. Using this technique we do not have to
diff --git a/src/com/gitblit/Build.java b/src/com/gitblit/build/Build.java index be228af7..641b7aa7 100644 --- a/src/com/gitblit/Build.java +++ b/src/com/gitblit/build/Build.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitblit;
+package com.gitblit.build;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
@@ -32,6 +32,7 @@ import java.util.List; import java.util.Map;
import java.util.Properties;
+import com.gitblit.Constants;
import com.gitblit.utils.StringUtils;
public class Build {
diff --git a/src/com/gitblit/BuildSite.java b/src/com/gitblit/build/BuildSite.java index d96ca6e2..5a9825aa 100644 --- a/src/com/gitblit/BuildSite.java +++ b/src/com/gitblit/build/BuildSite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitblit;
+package com.gitblit.build;
import java.io.BufferedReader;
import java.io.File;
@@ -36,6 +36,7 @@ import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.beust.jcommander.Parameters;
+import com.gitblit.Constants;
import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
diff --git a/src/com/gitblit/BuildThumbnails.java b/src/com/gitblit/build/BuildThumbnails.java index 4f2b2ab8..f1bdbdef 100644 --- a/src/com/gitblit/BuildThumbnails.java +++ b/src/com/gitblit/build/BuildThumbnails.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitblit;
+package com.gitblit.build;
import java.awt.Dimension;
import java.awt.Image;
diff --git a/src/com/gitblit/BuildWebXml.java b/src/com/gitblit/build/BuildWebXml.java index 8e957df5..c37f0147 100644 --- a/src/com/gitblit/BuildWebXml.java +++ b/src/com/gitblit/build/BuildWebXml.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitblit;
+package com.gitblit.build;
import java.io.BufferedReader;
import java.io.File;
@@ -28,6 +28,8 @@ import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.beust.jcommander.Parameters;
+import com.gitblit.Keys;
+import com.gitblit.Keys.server;
import com.gitblit.utils.StringUtils;
public class BuildWebXml {
|