capnp -> org.capnproto

Makefile

@@ -18,7 +18,7 @@ CAPNP_SOURCES=\
 	src/capnp/WirePointer.java\
 	src/capnp/WordPointer.java
 
-CAPNP_COMPILATION_MARKER=capnp/PointerReader.class
+CAPNP_COMPILATION_MARKER=org/capnproto/PointerReader.class
 
 CAPNPC_JAVA_SOURCES=src/compiler/capnpc-java.c++
 
@@ -27,11 +27,11 @@ CAPNPC_JAVA_SOURCES=src/compiler/capnpc-java.c++
 all : capnpc-java addressbook capnp
 
 clean :
-	rm -rf capnpc-java capnp examples/*.class
+	rm -rf capnpc-java org examples/*.class
 
 capnp : $(CAPNP_COMPILATION_MARKER)
 
-capnp/PointerReader.class : $(CAPNP_SOURCES)
+$(CAPNP_COMPILATION_MARKER) : $(CAPNP_SOURCES)
 	javac -d . $(CAPNP_SOURCES)
 
 capnpc-java : $(CAPNPC_JAVA_SOURCES)

examples/AddressbookMain.java

@@ -1,3 +1,6 @@
+import org.capnproto.MessageReader;
+import org.capnproto.StructList;
+import org.capnproto.InputStreamMessageReader;
 
 public class AddressbookMain {
 
@@ -6,15 +9,15 @@ public class AddressbookMain {
     }
 
     public static void printAddressBook() throws java.io.IOException {
-        capnp.MessageReader message = capnp.InputStreamMessageReader.create(System.in);
+        MessageReader message = InputStreamMessageReader.create(System.in);
         Addressbook.AddressBook.Reader addressbook = message.getRoot(Addressbook.AddressBook.Reader.factory);
-        capnp.StructList.Reader<Addressbook.Person.Reader> people = addressbook.getPeople();
+        StructList.Reader<Addressbook.Person.Reader> people = addressbook.getPeople();
         int size = people.size();
         for(int ii = 0; ii < size; ++ii) {
             Addressbook.Person.Reader person = people.get(ii);
             System.out.println(person.getName().toString() + ": " + person.getEmail().toString());
 
-            capnp.StructList.Reader<Addressbook.Person.PhoneNumber.Reader> phones = person.getPhones();
+            StructList.Reader<Addressbook.Person.PhoneNumber.Reader> phones = person.getPhones();
             for (int jj = 0; jj < phones.size(); ++jj) {
                 Addressbook.Person.PhoneNumber.Reader phone = phones.get(jj);
                 String typeName = "UNKNOWN";

src/capnp/AnyPointer.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 public class AnyPointer {
 

src/capnp/FieldSize.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 public class FieldSize {
     public static final byte VOID = 0;

src/capnp/FromStructReader.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 public interface FromStructReader<T> {
     public abstract T fromStructReader(StructReader reader);

src/capnp/InputStreamMessageReader.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 import java.io.InputStream;
 import java.io.IOException;

src/capnp/ListPointer.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 import java.nio.ByteBuffer;
 

src/capnp/ListReader.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 public class ListReader {
     SegmentReader segment;

src/capnp/MessageReader.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 import java.nio.ByteBuffer;
 

src/capnp/PointerReader.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 public class PointerReader {
     public SegmentReader segment;

src/capnp/SegmentReader.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 import java.nio.ByteBuffer;
 

src/capnp/StructList.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 
 public class StructList {

src/capnp/StructPointer.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 import java.nio.ByteBuffer;
 

src/capnp/StructReader.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 public class StructReader {
     public SegmentReader segment;

src/capnp/Text.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 import java.nio.ByteBuffer;
 

src/capnp/WireHelpers.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 class WireHelpers {
 

src/capnp/WirePointer.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 import java.nio.ByteBuffer;
 

src/capnp/WordPointer.java

@@ -1,4 +1,4 @@
-package capnp;
+package org.capnproto;
 
 import java.nio.ByteBuffer;
 

src/capnp/layout.java

@@ -1,3 +1,3 @@
-package capnp;
+package org.capnproto;
 
 

src/compiler/capnpc-java.c++

@@ -260,8 +260,8 @@ private:
       case schema::Type::FLOAT32: return kj::strTree("float");
       case schema::Type::FLOAT64: return kj::strTree("double");
 
-      case schema::Type::TEXT: return kj::strTree(" capnp.Text");
-      case schema::Type::DATA: return kj::strTree(" capnp.Data");
+      case schema::Type::TEXT: return kj::strTree(" org.capnproto.Text");
+      case schema::Type::DATA: return kj::strTree(" org.capnproto.Data");
 
       case schema::Type::ENUM:
         return javaFullName(schemaLoader.get(type.getEnum().getTypeId()));
@@ -272,7 +272,7 @@ private:
 
       case schema::Type::LIST:
         // XXX
-        return kj::strTree(" capnp.StructList");
+        return kj::strTree(" org.capnproto.StructList");
 
       case schema::Type::ANY_POINTER:
         // Not used.
@@ -929,7 +929,7 @@ private:
                          "    return new ", type, ".Reader<",
                          elementReaderType,
                          ">(_reader.getPointerField(",
-                         offset, ").getList(capnp.FieldSize.INLINE_COMPOSITE), ", elementReaderType, ".factory);\n") :
+                         offset, ").getList(org.capnproto.FieldSize.INLINE_COMPOSITE), ", elementReaderType, ".factory);\n") :
              (kind == FieldKind::BLOB ?
               kj::strTree(spaces(indent), "    return _reader.getPointerField(",
                           offset,").getText();\n") :
@@ -1043,13 +1043,14 @@ private:
                                int indent) {
     return kj::strTree(spaces(indent), "public static class Reader {\n",
                        spaces(indent),
-                       "  public static class Factory implements capnp.FromStructReader<Reader> {\n",
-                       spaces(indent), "    public Reader fromStructReader(capnp.StructReader reader) {\n",
+                       "  public static class Factory implements org.capnproto.FromStructReader<Reader> {\n",
+                       spaces(indent),
+                       "    public Reader fromStructReader(org.capnproto.StructReader reader) {\n",
                        spaces(indent), "      return new Reader(reader);\n",
                        spaces(indent), "    }\n",
                        spaces(indent), "  }\n",
                        spaces(indent), "  public static final Factory factory = new Factory();\n",
-                       spaces(indent), "  public Reader(capnp.StructReader base){ this._reader = base; }\n",
+                       spaces(indent), "  public Reader(org.capnproto.StructReader base){ this._reader = base; }\n",
                        "\n",
                        (isUnion ?
                         kj::strTree(spaces(indent), "  public Which which() {\n",
@@ -1058,7 +1059,7 @@ private:
                                     spaces(indent), "  }\n")
                         : kj::strTree()),
                        kj::mv(methodDecls),
-                       spaces(indent), "  public capnp.StructReader _reader;\n",
+                       spaces(indent), "  public org.capnproto.StructReader _reader;\n",
                        spaces(indent), "}\n"
                        "\n");
   }
@@ -1521,7 +1522,7 @@ private:
           "// Generated by Cap'n Proto compiler, DO NOT EDIT\n"
           "// source: ", baseName(displayName), "\n",
           "\n",
-          //"import capnp;\n",
+          //"import org.capnproto;\n",
           //          KJ_MAP(n, namespaceParts) { return kj::strTree("namespace ", n, " {\n"); }, "\n",
           "public class ", outerClassName, " {\n",
           KJ_MAP(n, nodeTexts) { return kj::mv(n.outerTypeDef); },