You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/08/10 20:26:58 UTC
olingo-odata4 git commit: [OLINGO-731] Added version information to
MANIFEST.MF
Repository: olingo-odata4
Updated Branches:
refs/heads/master 1d88d9c98 -> dc44d7c99
[OLINGO-731] Added version information to MANIFEST.MF
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/dc44d7c9
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/dc44d7c9
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/dc44d7c9
Branch: refs/heads/master
Commit: dc44d7c9980bbc3249f9406b0e220bbae09a423e
Parents: 1d88d9c
Author: mibo <mi...@apache.org>
Authored: Mon Aug 10 20:09:46 2015 +0200
Committer: mibo <mi...@apache.org>
Committed: Mon Aug 10 20:21:35 2015 +0200
----------------------------------------------------------------------
lib/server-core/pom.xml | 3 ++-
.../core/debug/DebugResponseHelperImpl.java | 25 +++++++++++++-------
2 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dc44d7c9/lib/server-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index 68c48a3..9e5e494 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -116,10 +116,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.plugin.version}</version>
+ <version>${maven.bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
+ <Implementation-Version>${project.version}</Implementation-Version>
<Export-Package>
org.apache.olingo.server.core
</Export-Package>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/dc44d7c9/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java
index 94ab544..4b093e9 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugResponseHelperImpl.java
@@ -46,9 +46,9 @@ import com.fasterxml.jackson.core.JsonGenerator;
public class DebugResponseHelperImpl implements DebugResponseHelper {
- private static enum DebugFormat {
+ private enum DebugFormat {
JSON, HTML, DOWNLOAD
- };
+ }
private final DebugFormat requestedFormat;
@@ -150,12 +150,7 @@ public class DebugResponseHelperImpl implements DebugResponseHelper {
gen.writeFieldName("server");
gen.writeStartObject();
- String version = DebugResponseHelperImpl.class.getPackage().getImplementationVersion();
- if (version != null) {
- gen.writeStringField("version", version);
- } else {
- gen.writeNullField("version");
- }
+ gen.writeStringField("version", getVersion());
for (DebugTab part : parts.subList(2, parts.size())) {
gen.writeFieldName(part.getName().toLowerCase(Locale.ROOT));
part.appendJson(gen);
@@ -169,6 +164,20 @@ public class DebugResponseHelperImpl implements DebugResponseHelper {
return csb.getInputStream();
}
+ /**
+ * Get version field information for response.
+ * Result is never null.
+ *
+ * @return version field information
+ */
+ private String getVersion() {
+ final String version = DebugResponseHelperImpl.class.getPackage().getImplementationVersion();
+ if (version == null) {
+ return "Olingo";
+ }
+ return "Olingo " + version;
+ }
+
private InputStream wrapInHtml(final List<DebugTab> parts, String title) throws IOException {
StringWriter writer = new StringWriter();