diff options
4 files changed, 60 insertions, 13 deletions
diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/server/RootLocaleTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/server/RootLocaleTest.java new file mode 100644 index 0000000000..a24c86d971 --- /dev/null +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/server/RootLocaleTest.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com> + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.eclipse.jgit.http.server; + +import org.eclipse.jgit.nls.NLS; +import org.junit.Before; +import org.junit.Test; + +public class RootLocaleTest { + @Before + public void setUp() { + NLS.setLocale(NLS.ROOT_LOCALE); + } + + @Test + public void testHttpServerText() { + NLS.getBundleFor(HttpServerText.class); + } +} diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 5db483b1fa..a7a3e1161d 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Import-Package: org.eclipse.jgit.api;version="[2.0.0,2.1.0)", org.eclipse.jgit.errors;version="[2.0.0,2.1.0)", org.eclipse.jgit.events;version="[2.0.0,2.1.0)", org.eclipse.jgit.fnmatch;version="[2.0.0,2.1.0)", - org.eclipse.jgit.http.server;version="[2.0.0,2.1.0)", org.eclipse.jgit.ignore;version="[2.0.0,2.1.0)", org.eclipse.jgit.internal;version="[2.0.0,2.1.0)", org.eclipse.jgit.iplog;version="[2.0.0,2.1.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 969e205b0b..7eee851b3e 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -102,12 +102,6 @@ <dependency> <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.iplog</artifactId> <version>${project.version}</version> </dependency> diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java index 04d95f4e53..4e694b6f4b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java @@ -45,7 +45,6 @@ package org.eclipse.jgit.nls; import org.eclipse.jgit.awtui.UIText; import org.eclipse.jgit.console.ConsoleText; -import org.eclipse.jgit.http.server.HttpServerText; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.iplog.IpLogText; import org.eclipse.jgit.pgm.CLIText; @@ -64,11 +63,6 @@ public class RootLocaleTest { } @Test - public void testHttpServerText() { - NLS.getBundleFor(HttpServerText.class); - } - - @Test public void testConsoleText() { NLS.getBundleFor(ConsoleText.class); } |