You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/07/04 09:12:06 UTC
[1/3] git commit: [OLINGO-328] fix pom error
Repository: olingo-odata4
Updated Branches:
refs/heads/olingo337 7658c6560 -> f11715442
[OLINGO-328] fix pom error
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/263e4280
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/263e4280
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/263e4280
Branch: refs/heads/olingo337
Commit: 263e42802fe2806584b48cde1c040cfd54bf6c41
Parents: 2bd0662
Author: Stephan Klevenz <st...@sap.com>
Authored: Fri Jul 4 08:58:47 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Fri Jul 4 08:58:47 2014 +0200
----------------------------------------------------------------------
lib/server-tecsvc/pom.xml | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/263e4280/lib/server-tecsvc/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml
index 8d58cd3..b5fb60e 100644
--- a/lib/server-tecsvc/pom.xml
+++ b/lib/server-tecsvc/pom.xml
@@ -50,6 +50,40 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-a-jar</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <packaging>jar</packaging>
+ <artifactId>${project.artifactId}</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <file>
+ ${project.build.directory}/${project.artifactId}-${project.version}.jar
+ </file>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.keyboardsamurais.maven</groupId>
<artifactId>maven-timestamp-plugin</artifactId>
<configuration>
[2/3] git commit: Merge remote-tracking branch 'origin/master' into
olingo337
Posted by il...@apache.org.
Merge remote-tracking branch 'origin/master' into olingo337
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/ea0d3a53
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/ea0d3a53
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/ea0d3a53
Branch: refs/heads/olingo337
Commit: ea0d3a53e1c9d2ca7fabe2d4da31c0885a3d820c
Parents: 7658c65 263e428
Author: Francesco Chicchiriccò <--global>
Authored: Fri Jul 4 09:11:30 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Fri Jul 4 09:11:30 2014 +0200
----------------------------------------------------------------------
lib/server-tecsvc/pom.xml | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
----------------------------------------------------------------------
[3/3] git commit: Fixing checkstyle errors
Posted by il...@apache.org.
Fixing checkstyle errors
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/f1171544
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/f1171544
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/f1171544
Branch: refs/heads/olingo337
Commit: f1171544291c8f4a23d432f1211aad511b5d32e3
Parents: ea0d3a5
Author: Francesco Chicchiriccò <--global>
Authored: Fri Jul 4 09:11:52 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Fri Jul 4 09:11:52 2014 +0200
----------------------------------------------------------------------
.../apache/olingo/commons/api/format/AcceptType.java | 1 -
.../apache/olingo/commons/api/format/ContentType.java | 12 ++++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f1171544/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java
index 39bdf75..736b747 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java
@@ -24,7 +24,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import java.util.regex.Pattern;
/**
* Internally used {@link AcceptType} for OData library.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f1171544/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java
index 3506ffb..a686880 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java
@@ -52,10 +52,12 @@ public class ContentType {
public static final ContentType APPLICATION_ATOM_XML = create("application", "atom+xml");
public static final ContentType APPLICATION_ATOM_XML_CS_UTF_8 = create(APPLICATION_ATOM_XML,
TypeUtil.PARAMETER_CHARSET, TypeUtil.CHARSET_UTF_8);
- public static final ContentType APPLICATION_ATOM_XML_ENTRY = create(APPLICATION_ATOM_XML,TypeUtil. PARAMETER_TYPE, "entry");
+ public static final ContentType APPLICATION_ATOM_XML_ENTRY =
+ create(APPLICATION_ATOM_XML,TypeUtil. PARAMETER_TYPE, "entry");
public static final ContentType APPLICATION_ATOM_XML_ENTRY_CS_UTF_8 = create(APPLICATION_ATOM_XML_ENTRY,
TypeUtil. PARAMETER_CHARSET, TypeUtil.CHARSET_UTF_8);
- public static final ContentType APPLICATION_ATOM_XML_FEED = create(APPLICATION_ATOM_XML,TypeUtil. PARAMETER_TYPE, "feed");
+ public static final ContentType APPLICATION_ATOM_XML_FEED =
+ create(APPLICATION_ATOM_XML,TypeUtil. PARAMETER_TYPE, "feed");
public static final ContentType APPLICATION_ATOM_XML_FEED_CS_UTF_8 = create(APPLICATION_ATOM_XML_FEED,
TypeUtil. PARAMETER_CHARSET,TypeUtil.CHARSET_UTF_8);
public static final ContentType APPLICATION_ATOM_SVC = create("application", "atomsvc+xml");
@@ -66,7 +68,8 @@ public class ContentType {
TypeUtil. PARAMETER_CHARSET,TypeUtil. CHARSET_UTF_8);
public static final ContentType APPLICATION_OCTET_STREAM = create("application", "octet-stream");
public static final ContentType TEXT_PLAIN = create("text", "plain");
- public static final ContentType TEXT_PLAIN_CS_UTF_8 = create(TEXT_PLAIN, TypeUtil.PARAMETER_CHARSET,TypeUtil. CHARSET_UTF_8);
+ public static final ContentType TEXT_PLAIN_CS_UTF_8 =
+ create(TEXT_PLAIN, TypeUtil.PARAMETER_CHARSET,TypeUtil. CHARSET_UTF_8);
public static final ContentType MULTIPART_MIXED = create("multipart", "mixed");
public static final ContentType APPLICATION_XHTML_XML = create("application", "xhtml+xml");
@@ -205,7 +208,8 @@ public class ContentType {
typeSubtype.add(tokens[1]);
}
} else {
- throw new IllegalArgumentException("Too many '" +TypeUtil.TYPE_SUBTYPE_SEPARATOR + "' in format '" + format + "'.");
+ throw new IllegalArgumentException(
+ "Too many '" +TypeUtil.TYPE_SUBTYPE_SEPARATOR + "' in format '" + format + "'.");
}
} else {
throw new IllegalArgumentException("No separator '" +TypeUtil.TYPE_SUBTYPE_SEPARATOR