diff options
Diffstat (limited to 'org.eclipse.jgit.http.server')
6 files changed, 54 insertions, 31 deletions
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index b42ac1d92a..aaed0f77b9 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.3.7.qualifier +Bundle-Version: 5.4.4.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="5.3.7", - org.eclipse.jgit.http.server.glue;version="5.3.7"; +Export-Package: org.eclipse.jgit.http.server;version="5.4.4", + org.eclipse.jgit.http.server.glue;version="5.4.4"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="5.3.7"; + org.eclipse.jgit.http.server.resolver;version="5.4.4"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,13 +18,13 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.errors;version="[5.3.7,5.4.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.3.7,5.4.0)", - org.eclipse.jgit.internal.storage.file;version="[5.3.7,5.4.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.3.7,5.4.0)", - org.eclipse.jgit.lib;version="[5.3.7,5.4.0)", - org.eclipse.jgit.nls;version="[5.3.7,5.4.0)", - org.eclipse.jgit.revwalk;version="[5.3.7,5.4.0)", - org.eclipse.jgit.transport;version="[5.3.7,5.4.0)", - org.eclipse.jgit.transport.resolver;version="[5.3.7,5.4.0)", - org.eclipse.jgit.util;version="[5.3.7,5.4.0)" + org.eclipse.jgit.errors;version="[5.4.4,5.5.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.4.4,5.5.0)", + org.eclipse.jgit.internal.storage.file;version="[5.4.4,5.5.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.4.4,5.5.0)", + org.eclipse.jgit.lib;version="[5.4.4,5.5.0)", + org.eclipse.jgit.nls;version="[5.4.4,5.5.0)", + org.eclipse.jgit.revwalk;version="[5.4.4,5.5.0)", + org.eclipse.jgit.transport;version="[5.4.4,5.5.0)", + org.eclipse.jgit.transport.resolver;version="[5.4.4,5.5.0)", + org.eclipse.jgit.util;version="[5.4.4,5.5.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF new file mode 100644 index 0000000000..fea01dadd0 --- /dev/null +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.eclipse.jgit.http.server - Sources +Bundle-SymbolicName: org.eclipse.jgit.http.server.source +Bundle-Vendor: Eclipse.org - JGit +Bundle-Version: 5.4.4.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.4.4.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 843139d03e..0e1ea2a33e 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.4.4-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.server</artifactId> @@ -64,6 +64,7 @@ <properties> <translate-qualifier/> + <source-bundle-manifest>${project.build.directory}/META-INF/SOURCE-MANIFEST.MF</source-bundle-manifest> </properties> <dependencies> @@ -99,6 +100,28 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>translate-source-qualifier</id> + <phase>generate-resources</phase> + <configuration> + <target> + <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> + <replace file="${source-bundle-manifest}"> + <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + </replace> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <inherited>true</inherited> <executions> diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java index 2ebe1b7d2f..51de8abd0e 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java @@ -202,7 +202,7 @@ public class GitFilter extends MetaFilter { if (resolver == null) { File root = getFile(filterConfig, "base-path"); boolean exportAll = getBoolean(filterConfig, "export-all"); - setRepositoryResolver(new FileResolver<HttpServletRequest>(root, exportAll)); + setRepositoryResolver(new FileResolver<>(root, exportAll)); } initialized = true; diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java index b6d73b5591..256279bfed 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ServletUtils.java @@ -64,7 +64,6 @@ import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jgit.internal.storage.dfs.DfsRepository; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; @@ -276,12 +275,11 @@ public final class ServletUtils { } static String identify(Repository git) { - if (git instanceof DfsRepository) { - return ((DfsRepository) git).getDescription().getRepositoryName(); - } else if (git.getDirectory() != null) { - return git.getDirectory().getPath(); + String identifier = git.getIdentifier(); + if (identifier == null) { + return "unknown"; } - return "unknown"; + return identifier; } private ServletUtils() { diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java index d8fa712ebf..14b6506ad3 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaServlet.java @@ -47,7 +47,6 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import java.io.IOException; -import javax.servlet.FilterChain; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -140,14 +139,10 @@ public class MetaServlet extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { - filter.doFilter(req, res, new FilterChain() { - @Override - public void doFilter(ServletRequest request, - ServletResponse response) throws IOException, - ServletException { - ((HttpServletResponse) response).sendError(SC_NOT_FOUND); - } - }); + filter.doFilter(req, res, + (ServletRequest request, ServletResponse response) -> { + ((HttpServletResponse) response).sendError(SC_NOT_FOUND); + }); } /** |