Skip to content

Commit 0091886

Browse files
committed
#82 Merge v07-draft into v07
2 parents 688a04d + 1620ca0 commit 0091886

File tree

65 files changed

+4009
-2001
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+4009
-2001
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ target
1010
build
1111
lib
1212
.idea
13+
atlassian-ide-plugin.xml
1314

LICENCE.sbt-extras.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Generated from http://www.opensource.org/licenses/bsd-license.php
2+
Copyright (c) 2011, Paul Phillips. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are
6+
met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
* Neither the name of the author nor the names of its contributors
14+
may be used to endorse or promote products derived from this software
15+
without specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21+
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
23+
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
24+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
26+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

NOTICE

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
This product includes the software developed by third-party:
2+
3+
* Google Guava https://code.google.com/p/guava-libraries/ (APL2)
4+
* sbt-extras: https://github.com/paulp/sbt-extras (BSD) (LICENSE.sbt-extras.txt)
5+

msgpack-core/pom.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>org.msgpack</groupId>
8-
<artifactId>msgpack-root</artifactId>
9-
<version>0.7.0-SNAPSHOT</version>
10-
</parent>
6+
<parent>
7+
<groupId>org.msgpack</groupId>
8+
<artifactId>msgpack-root</artifactId>
9+
<version>0.7.0-SNAPSHOT</version>
10+
</parent>
1111

12-
<artifactId>msgpack-core</artifactId>
13-
<name>msgpack-core</name>
12+
<artifactId>msgpack-core</artifactId>
13+
<name>msgpack-core</name>
1414

15-
<dependencies>
16-
<dependency>
17-
<groupId>junit</groupId>
18-
<artifactId>junit</artifactId>
19-
<scope>test</scope>
20-
</dependency>
15+
<dependencies>
16+
<dependency>
17+
<groupId>junit</groupId>
18+
<artifactId>junit</artifactId>
19+
<scope>test</scope>
20+
</dependency>
2121

22-
<dependency>
23-
<groupId>org.mockito</groupId>
24-
<artifactId>mockito-core</artifactId>
25-
<scope>test</scope>
26-
</dependency>
27-
</dependencies>
22+
<dependency>
23+
<groupId>org.mockito</groupId>
24+
<artifactId>mockito-core</artifactId>
25+
<scope>test</scope>
26+
</dependency>
27+
</dependencies>
2828
</project>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.msgpack.core;
2+
3+
/**
4+
* Header of extended type
5+
*/
6+
public class ExtendedTypeHeader {
7+
private final int type;
8+
private final int length;
9+
ExtendedTypeHeader(int type, int length) {
10+
this.type = type;
11+
this.length = length;
12+
}
13+
14+
public int getType() {
15+
return type;
16+
}
17+
18+
public int getLength() {
19+
return length;
20+
}
21+
}

0 commit comments

Comments
 (0)