diff options
| -rw-r--r-- | build.xml | 3 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/client/GitblitManagerLauncher.java | 165 | ||||
| -rw-r--r-- | src/site/federation.mkd | 6 |
3 files changed, 4 insertions, 170 deletions
@@ -308,7 +308,6 @@ excludes="**/.class, **/*.java, **/Thumbs.db, **/*.mkd, **/*.md, **/*.css, com/gitblit/wicket/**">
<mainclass name="com.gitblit.FederationClient" />
<class name="com.gitblit.Keys" />
- <launcher paths="ext" />
<resource file="${project.compileOutputDirectory}/log4j.properties" />
</mx:genjar>
@@ -379,7 +378,7 @@ </fileset>
</resource>
- <mainclass name="com.gitblit.client.GitblitManagerLauncher" />
+ <mainclass name="com.gitblit.client.GitblitManager" />
<class name="com.gitblit.Keys" />
<class name="com.gitblit.client.GitblitClient" />
<class name="com.gitblit.models.FederationModel" />
diff --git a/src/main/java/com/gitblit/client/GitblitManagerLauncher.java b/src/main/java/com/gitblit/client/GitblitManagerLauncher.java deleted file mode 100644 index 8a43c472..00000000 --- a/src/main/java/com/gitblit/client/GitblitManagerLauncher.java +++ /dev/null @@ -1,165 +0,0 @@ -/*
- * Copyright 2011 gitblit.com.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gitblit.client;
-
-import java.awt.Color;
-import java.awt.EventQueue;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.SplashScreen;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import com.gitblit.Constants;
-
-/**
- * Downloads dependencies and launches Gitblit Manager.
- *
- * @author James Moger
- *
- */
-public class GitblitManagerLauncher {
-
- public static final boolean DEBUG = false;
-
- /**
- * Parameters of the method to add an URL to the System classes.
- */
- private static final Class<?>[] PARAMETERS = new Class[] { URL.class };
-
- public static void main(String[] args) {
- final SplashScreen splash = SplashScreen.getSplashScreen();
-
- File libFolder = new File("ext");
- List<File> jars = findJars(libFolder.getAbsoluteFile());
-
- // sort the jars by name and then reverse the order so the newer version
- // of the library gets loaded in the event that this is an upgrade
- Collections.sort(jars);
- Collections.reverse(jars);
- for (File jar : jars) {
- try {
- updateSplash(splash, Translation.get("gb.loading") + " " + jar.getName() + "...");
- addJarFile(jar);
- } catch (IOException e) {
-
- }
- }
-
- updateSplash(splash, Translation.get("gb.starting") + " Gitblit Manager...");
- GitblitManager.main(args);
- }
-
- private static void updateSplash(final SplashScreen splash, final String string) {
- if (splash == null) {
- return;
- }
- try {
- EventQueue.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- Graphics2D g = splash.createGraphics();
- if (g != null) {
- // Splash is 320x120
- FontMetrics fm = g.getFontMetrics();
-
- // paint startup status
- g.setColor(Color.darkGray);
- int h = fm.getHeight() + fm.getMaxDescent();
- int x = 5;
- int y = 115;
- int w = 320 - 2 * x;
- g.fillRect(x, y - h, w, h);
- g.setColor(Color.lightGray);
- g.drawRect(x, y - h, w, h);
- g.setColor(Color.WHITE);
- int xw = fm.stringWidth(string);
- g.drawString(string, x + ((w - xw) / 2), y - 5);
-
- // paint version
- String ver = "v" + Constants.getVersion();
- int vw = g.getFontMetrics().stringWidth(ver);
- g.drawString(ver, 320 - vw - 5, 34);
- g.dispose();
- splash.update();
- }
- }
- });
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-
- public static List<File> findJars(File folder) {
- List<File> jars = new ArrayList<File>();
- if (folder.exists()) {
- File[] libs = folder.listFiles(new FileFilter() {
- @Override
- public boolean accept(File file) {
- return !file.isDirectory() && file.getName().toLowerCase().endsWith(".jar");
- }
- });
- if (libs != null && libs.length > 0) {
- jars.addAll(Arrays.asList(libs));
- if (DEBUG) {
- for (File jar : jars) {
- System.out.println("found " + jar);
- }
- }
- }
- }
-
- return jars;
- }
-
- /**
- * Adds a file to the classpath
- *
- * @param f
- * the file to be added
- * @throws IOException
- */
- public static void addJarFile(File f) throws IOException {
- if (f.getName().indexOf("-sources") > -1 || f.getName().indexOf("-javadoc") > -1) {
- // don't add source or javadoc jars to runtime classpath
- return;
- }
- URL u = f.toURI().toURL();
- if (DEBUG) {
- System.out.println("load=" + u.toExternalForm());
- }
- URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
- Class<?> sysclass = URLClassLoader.class;
- try {
- Method method = sysclass.getDeclaredMethod("addURL", PARAMETERS);
- method.setAccessible(true);
- method.invoke(sysloader, new Object[] { u });
- } catch (Throwable t) {
- throw new IOException(MessageFormat.format(
- "Error, could not add {0} to system classloader", f.getPath()), t);
- }
- }
-
-}
diff --git a/src/site/federation.mkd b/src/site/federation.mkd index 7574a321..231a9f35 100644 --- a/src/site/federation.mkd +++ b/src/site/federation.mkd @@ -332,9 +332,9 @@ If you are pulling from a Gitblit with a self-signed SSL certificate you will ne ### Command-Line Parameters
Instead of using `federation.properties` you may directly specify a Gitblit instance to pull from with command-line parameters.
- java -jar fedclient.jar --url https://go.gitblit.com --mirror --bare --token 123456789
+ java -cp fedclient.jar;"%CD%/ext/*" com.gitblit.FederationClient --url https://go.gitblit.com --mirror --bare --token 123456789
--repositoriesFolder c:/mymirror
- java -jar fedclient.jar --url https://go.gitblit.com --mirror --bare --token 123456789
- --repositoriesFolder c:/mymirror --daemon --frequency "24 hours"
+ java -cp fedclient.jar:ext/* com.gitblit.FederationClient --url https://go.gitblit.com --mirror --bare --token 123456789
+ --repositoriesFolder /srv/mymirror --daemon --frequency "24 hours"
|