You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2017/06/09 23:11:02 UTC
reef git commit: [REEF-1811] Move current bridge Avro messages to
lang/common/bridge/avro
Repository: reef
Updated Branches:
refs/heads/master c5cd0853c -> 2f8c76b81
[REEF-1811] Move current bridge Avro messages to lang/common/bridge/avro
- Move the current avro messages on the java side to
lang/common/bridge/avro so both the C# and java
sides can generate compatible messages classes from
the common avsc files.
JIRA:
[REEF-1811](https://issues.apache.org/jira/browse/REEF-1811)
Pull Request:
This closes #1315
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/2f8c76b8
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/2f8c76b8
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/2f8c76b8
Branch: refs/heads/master
Commit: 2f8c76b818b6289ca3d1f52718196070d3ab181d
Parents: c5cd085
Author: Doug Service <do...@apache.org>
Authored: Fri Jun 9 19:19:52 2017 +0000
Committer: Markus Weimer <we...@apache.org>
Committed: Fri Jun 9 16:09:21 2017 -0700
----------------------------------------------------------------------
lang/common/bridge/avro/Bridge.avsc | 51 ++++++++++++++++++++
lang/common/bridge/avro/DefinedRuntimes.avsc | 37 ++++++++++++++
lang/java/reef-bridge-java/pom.xml | 2 +-
.../reef-bridge-java/src/main/avro/Bridge.avsc | 51 --------------------
.../src/main/avro/DefinedRuntimes.avsc | 37 --------------
5 files changed, 89 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/2f8c76b8/lang/common/bridge/avro/Bridge.avsc
----------------------------------------------------------------------
diff --git a/lang/common/bridge/avro/Bridge.avsc b/lang/common/bridge/avro/Bridge.avsc
new file mode 100644
index 0000000..1b75efd
--- /dev/null
+++ b/lang/common/bridge/avro/Bridge.avsc
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ [
+/*
+ * Defines the schema for Bridge classes such that information can be passed from C# Evaluator to C# Driver.
+ */
+ {
+ "namespace":"org.apache.reef.javabridge.avro",
+ "type":"record",
+ "name":"AvroFailedTask",
+ "doc":"Defines the schema for failed task. Tunnels Task failures from C# Evaluator to Java Driver to C# Driver.",
+ "fields":[
+ {
+ "name":"identifier",
+ "doc":"The Task ID of the failed Task.",
+ "type":"string"
+ },
+ {
+ "name":"data",
+ "doc":"The data passed back from the Failed Task, if any.",
+ "type":"bytes"
+ },
+ {
+ "name":"cause",
+ "doc":"The serialized Exception of that caused the Task failure.",
+ "type":"bytes"
+ },
+ {
+ "name":"message",
+ "doc":"The message of the Task failure, if any.",
+ "type":"string"
+ }
+ ]
+ }
+]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/2f8c76b8/lang/common/bridge/avro/DefinedRuntimes.avsc
----------------------------------------------------------------------
diff --git a/lang/common/bridge/avro/DefinedRuntimes.avsc b/lang/common/bridge/avro/DefinedRuntimes.avsc
new file mode 100644
index 0000000..3e089af
--- /dev/null
+++ b/lang/common/bridge/avro/DefinedRuntimes.avsc
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ [
+/*
+ * Defines the schema for the defined runtime names. This avro object is used to pass runtime names
+ * to the c#
+ */
+ {
+ "namespace":"org.apache.reef.javabridge.avro",
+ "type":"record",
+ "name":"DefinedRuntimes",
+ "doc":"Defines the schema for the defined runtime names. This avro object is used to pass runtime names to the c#",
+ "fields":[
+ {
+ "name":"runtimeNames",
+ "type":{"type":"array", "items":"string"},
+ "doc":"defined runtime names"
+ }
+ ]
+ }
+]
http://git-wip-us.apache.org/repos/asf/reef/blob/2f8c76b8/lang/java/reef-bridge-java/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-java/pom.xml b/lang/java/reef-bridge-java/pom.xml
index a34715e..6d6ff2a 100644
--- a/lang/java/reef-bridge-java/pom.xml
+++ b/lang/java/reef-bridge-java/pom.xml
@@ -100,7 +100,7 @@ under the License.
<goal>schema</goal>
</goals>
<configuration>
- <sourceDirectory>${project.basedir}/src/main/avro/</sourceDirectory>
+ <sourceDirectory>${rootPath}/lang/common/bridge/avro/</sourceDirectory>
<outputDirectory>${project.basedir}/target/generated-sources/avro/</outputDirectory>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/reef/blob/2f8c76b8/lang/java/reef-bridge-java/src/main/avro/Bridge.avsc
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-java/src/main/avro/Bridge.avsc b/lang/java/reef-bridge-java/src/main/avro/Bridge.avsc
deleted file mode 100644
index 1b75efd..0000000
--- a/lang/java/reef-bridge-java/src/main/avro/Bridge.avsc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- [
-/*
- * Defines the schema for Bridge classes such that information can be passed from C# Evaluator to C# Driver.
- */
- {
- "namespace":"org.apache.reef.javabridge.avro",
- "type":"record",
- "name":"AvroFailedTask",
- "doc":"Defines the schema for failed task. Tunnels Task failures from C# Evaluator to Java Driver to C# Driver.",
- "fields":[
- {
- "name":"identifier",
- "doc":"The Task ID of the failed Task.",
- "type":"string"
- },
- {
- "name":"data",
- "doc":"The data passed back from the Failed Task, if any.",
- "type":"bytes"
- },
- {
- "name":"cause",
- "doc":"The serialized Exception of that caused the Task failure.",
- "type":"bytes"
- },
- {
- "name":"message",
- "doc":"The message of the Task failure, if any.",
- "type":"string"
- }
- ]
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/2f8c76b8/lang/java/reef-bridge-java/src/main/avro/DefinedRuntimes.avsc
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-java/src/main/avro/DefinedRuntimes.avsc b/lang/java/reef-bridge-java/src/main/avro/DefinedRuntimes.avsc
deleted file mode 100644
index 3e089af..0000000
--- a/lang/java/reef-bridge-java/src/main/avro/DefinedRuntimes.avsc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- [
-/*
- * Defines the schema for the defined runtime names. This avro object is used to pass runtime names
- * to the c#
- */
- {
- "namespace":"org.apache.reef.javabridge.avro",
- "type":"record",
- "name":"DefinedRuntimes",
- "doc":"Defines the schema for the defined runtime names. This avro object is used to pass runtime names to the c#",
- "fields":[
- {
- "name":"runtimeNames",
- "type":{"type":"array", "items":"string"},
- "doc":"defined runtime names"
- }
- ]
- }
-]