You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2018/01/18 17:05:18 UTC
[15/19] celix git commit: CELIX-412: Adds missing AL comments,
based on the output of the apache rat tool
CELIX-412: Adds missing AL comments, based on the output of the apache rat tool
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/f32363ac
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/f32363ac
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/f32363ac
Branch: refs/heads/feature/CELIX-417-cmake-refactor
Commit: f32363ac03007b2109eeada28b03e2341e6c5749
Parents: c5c30a3
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Mon Jan 15 21:18:19 2018 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Mon Jan 15 21:18:19 2018 +0100
----------------------------------------------------------------------
cmake/cmake_celix/Runtimes.cmake | 17 +++++++++++++++
pubsub/examples/keys/publisher/private/.gitkeep | 14 +++++++++++++
pubsub/examples/keys/publisher/public/.gitkeep | 16 ++++++++++++++
.../examples/keys/subscriber/private/.gitkeep | 16 ++++++++++++++
pubsub/examples/keys/subscriber/public/.gitkeep | 16 ++++++++++++++
.../pubsub/msg_descriptors/poi1.properties | 17 +++++++++++++++
.../pubsub/msg_descriptors/poi2.properties | 17 +++++++++++++++
.../private/src/topic_publication.c | 11 ++--------
.../private/src/topic_publication.c | 9 +-------
.../public/include/pubsub_admin_match.h | 21 +++++++++++++++----
.../public/src/pubsub_admin_match.c | 22 +++++++++++++++-----
11 files changed, 150 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/cmake/cmake_celix/Runtimes.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/Runtimes.cmake b/cmake/cmake_celix/Runtimes.cmake
index a55a089..785a8c0 100644
--- a/cmake/cmake_celix/Runtimes.cmake
+++ b/cmake/cmake_celix/Runtimes.cmake
@@ -1,3 +1,20 @@
+# 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.
+
add_custom_target(runtimes ALL
DEPENDS "$<TARGET_PROPERTY:runtimes,DEPS>"
)
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/examples/keys/publisher/private/.gitkeep
----------------------------------------------------------------------
diff --git a/pubsub/examples/keys/publisher/private/.gitkeep b/pubsub/examples/keys/publisher/private/.gitkeep
index e69de29..4ea9b31 100644
--- a/pubsub/examples/keys/publisher/private/.gitkeep
+++ b/pubsub/examples/keys/publisher/private/.gitkeep
@@ -0,0 +1,14 @@
+# 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.
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/examples/keys/publisher/public/.gitkeep
----------------------------------------------------------------------
diff --git a/pubsub/examples/keys/publisher/public/.gitkeep b/pubsub/examples/keys/publisher/public/.gitkeep
index e69de29..978b68a 100644
--- a/pubsub/examples/keys/publisher/public/.gitkeep
+++ b/pubsub/examples/keys/publisher/public/.gitkeep
@@ -0,0 +1,16 @@
+# 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.
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/examples/keys/subscriber/private/.gitkeep
----------------------------------------------------------------------
diff --git a/pubsub/examples/keys/subscriber/private/.gitkeep b/pubsub/examples/keys/subscriber/private/.gitkeep
index e69de29..978b68a 100644
--- a/pubsub/examples/keys/subscriber/private/.gitkeep
+++ b/pubsub/examples/keys/subscriber/private/.gitkeep
@@ -0,0 +1,16 @@
+# 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.
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/examples/keys/subscriber/public/.gitkeep
----------------------------------------------------------------------
diff --git a/pubsub/examples/keys/subscriber/public/.gitkeep b/pubsub/examples/keys/subscriber/public/.gitkeep
index e69de29..978b68a 100644
--- a/pubsub/examples/keys/subscriber/public/.gitkeep
+++ b/pubsub/examples/keys/subscriber/public/.gitkeep
@@ -0,0 +1,16 @@
+# 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.
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/examples/pubsub/msg_descriptors/poi1.properties
----------------------------------------------------------------------
diff --git a/pubsub/examples/pubsub/msg_descriptors/poi1.properties b/pubsub/examples/pubsub/msg_descriptors/poi1.properties
index 634a20f..16a1962 100644
--- a/pubsub/examples/pubsub/msg_descriptors/poi1.properties
+++ b/pubsub/examples/pubsub/msg_descriptors/poi1.properties
@@ -1,3 +1,20 @@
+# 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.
+
#
# included in the bundle at location META-INF/topics/[pub|sub]/poi1.properties
#
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/examples/pubsub/msg_descriptors/poi2.properties
----------------------------------------------------------------------
diff --git a/pubsub/examples/pubsub/msg_descriptors/poi2.properties b/pubsub/examples/pubsub/msg_descriptors/poi2.properties
index 2edbdf6..739075c 100644
--- a/pubsub/examples/pubsub/msg_descriptors/poi2.properties
+++ b/pubsub/examples/pubsub/msg_descriptors/poi2.properties
@@ -1,3 +1,20 @@
+# 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.
+
#
# included in the bundle at location META-INF/topics/[pub|sub]/poi2.properties
#
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/pubsub_admin_udp_mc/private/src/topic_publication.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_udp_mc/private/src/topic_publication.c b/pubsub/pubsub_admin_udp_mc/private/src/topic_publication.c
index e43ec29..44106df 100644
--- a/pubsub/pubsub_admin_udp_mc/private/src/topic_publication.c
+++ b/pubsub/pubsub_admin_udp_mc/private/src/topic_publication.c
@@ -7,7 +7,7 @@
*"License"); you may not use this file except in compliance
*with the License. You may obtain a copy of the License at
*
- * htPSA_UDP_MC_TP://www.apache.org/licenses/LICENSE-2.0
+ * 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
@@ -16,13 +16,6 @@
*specific language governing permissions and limitations
*under the License.
*/
-/*
- * topic_publication.c
- *
- * \date Sep 24, 2015
- * \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
- * \copyright Apache License, Version 2.0
- */
#include <stdlib.h>
#include <string.h>
@@ -318,7 +311,7 @@ static int pubsub_topicPublicationSend(void* handle, unsigned int msgTypeId, con
celixThreadMutex_lock(&(bound->parent->tp_lock));
celixThreadMutex_lock(&(bound->mp_lock));
- pubsub_msg_serializer_t* msgSer = (pubsub_msg_serializer_t*)hashMap_get(bound->msgTypes, (void*)(uintptr_t)msgTypeId);
+ pubsub_msg_serializer_t* msgSer = (pubsub_msg_serializer_t*)hashMap_get(bound->msgTypes, (void*)(intptr_t)msgTypeId);
if (msgSer != NULL) {
int major=0, minor=0;
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/pubsub_admin_zmq/private/src/topic_publication.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_zmq/private/src/topic_publication.c b/pubsub/pubsub_admin_zmq/private/src/topic_publication.c
index 34c25b3..e405866 100644
--- a/pubsub/pubsub_admin_zmq/private/src/topic_publication.c
+++ b/pubsub/pubsub_admin_zmq/private/src/topic_publication.c
@@ -7,7 +7,7 @@
*"License"); you may not use this file except in compliance
*with the License. You may obtain a copy of the License at
*
- * htPSA_ZMQ_TP://www.apache.org/licenses/LICENSE-2.0
+ * 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
@@ -16,13 +16,6 @@
*specific language governing permissions and limitations
*under the License.
*/
-/*
- * topic_publication.c
- *
- * \date Sep 24, 2015
- * \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
- * \copyright Apache License, Version 2.0
- */
#include <czmq.h>
/* The following undefs prevent the collision between:
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/pubsub_common/public/include/pubsub_admin_match.h
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_common/public/include/pubsub_admin_match.h b/pubsub/pubsub_common/public/include/pubsub_admin_match.h
index a366c34..e95ca7d 100644
--- a/pubsub/pubsub_common/public/include/pubsub_admin_match.h
+++ b/pubsub/pubsub_common/public/include/pubsub_admin_match.h
@@ -1,10 +1,23 @@
-/*
- * pubsub_admin_match.h
+/**
+ *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
*
- * Created on: Sep 4, 2017
- * Author: dn234
+ * 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.
*/
+
#ifndef PUBSUB_ADMIN_MATCH_H_
#define PUBSUB_ADMIN_MATCH_H_
http://git-wip-us.apache.org/repos/asf/celix/blob/f32363ac/pubsub/pubsub_common/public/src/pubsub_admin_match.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_common/public/src/pubsub_admin_match.c b/pubsub/pubsub_common/public/src/pubsub_admin_match.c
index 1e821b5..2a695c1 100644
--- a/pubsub/pubsub_common/public/src/pubsub_admin_match.c
+++ b/pubsub/pubsub_common/public/src/pubsub_admin_match.c
@@ -1,11 +1,23 @@
-/*
- * pubsub_admin_match.c
-
+/**
+ *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
*
- * Created on: Sep 4, 2017
- * Author: dn234
+ *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.
*/
+
#include <string.h>
#include "service_reference.h"