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/15 20:18:35 UTC
[1/3] celix git commit: CELIX-412: Adds rlenferink public key to KEYS
Repository: celix
Updated Branches:
refs/heads/release/2.1.0 8821cfa63 -> f32363ac0
CELIX-412: Adds rlenferink public key to KEYS
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/d7307ff9
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/d7307ff9
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/d7307ff9
Branch: refs/heads/release/2.1.0
Commit: d7307ff90c180bf427048b6c19749c33997c2e33
Parents: efed212
Author: Roy Lenferink <le...@gmail.com>
Authored: Fri Jan 12 13:27:09 2018 +0100
Committer: Roy Lenferink <le...@gmail.com>
Committed: Fri Jan 12 13:27:09 2018 +0100
----------------------------------------------------------------------
KEYS | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/d7307ff9/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index fc22f80..2e52227 100644
--- a/KEYS
+++ b/KEYS
@@ -127,3 +127,62 @@ wmzm0Np85+1mjPpBpcgpjZ97vBDv/MzUKYTO0UPhy8AMuI7kASruD2f3GHuPxdXD
NnVt2h/2kW18Z3P8yJJuLaEMLg==
=HfMZ
-----END PGP PUBLIC KEY BLOCK-----
+
+pub 4096R/E43F742E 2018-01-12
+uid Roy Lenferink (CODE SIGNING KEY) <rl...@apache.org>
+sig 3 E43F742E 2018-01-12 Roy Lenferink (CODE SIGNING KEY) <rl...@apache.org>
+sub 4096R/556BE975 2018-01-12
+sig E43F742E 2018-01-12 Roy Lenferink (CODE SIGNING KEY) <rl...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQINBFpYhl8BEACvebgtWvn3onAczQJ9w1zIv//G7poKqpLlyLvAAXSKCljlQl8S
+5VUIMnm6vObDeoe+pDMqNVqAJHs6nv2z34ZOAa2nf+1/P2gpvuLS8fLl5fUZwiL7
+b2KMr7l023eTyCjVLI9esiSxf5UwN6sMazq/bLJVf71OVDjTO8VDJY8NHVVSz2+p
+tA6YrB50KfppMv0XzOkYjNB4QjfW9w7j7pbnjxLdqalWNDWkyMdgp6G92NSjxR1N
+i9S58o/JSZCXsWEddKpLZ3CRBa/nuDfaafQGbbwc0NDaGEUODe5V1ytFcN1N93qH
+sfCLqsabI/zm9tzIfZb+e4HR6jjHqByCCk5mpxkxhQNsTqHY/RPMf0jO2qVvGgT3
+jJKE5IWKtQvnwAF4onLPbQjKJd0nHQocwvvZkIq+PanGQ2heqlEcnGZ9iv8QwxG+
+HbqkfuNjDtXOXQESR2SarQHgHQXoInERqANG4BcW/X6V1fGnQQdAfrIX5axJm8Xs
+diBoSkgmcMtl4Ilt1cImzyp75KuveQB1qr9GVoOkQGYCv0pC3LArznUWFK2xihCU
+dYIgB/XFwI5D3I267frDOKn1MVxAkvkWmRyAVFy0TzcryAGvMNUBWZtv1/X0gWIm
++7uFazP4h4LMgDWHArZ0Npiqist2vCE5fjd3/XUtJkEAmW3xUPYBeO82fwARAQAB
+tDhSb3kgTGVuZmVyaW5rIChDT0RFIFNJR05JTkcgS0VZKSA8cmxlbmZlcmlua0Bh
+cGFjaGUub3JnPokCNwQTAQIAIQIbAwIeAQIXgAUCWliIPgULCQgHAwUVCgkICwUW
+AgMBAAAKCRCMe48A5D90Lsn7D/4kwx+a4w4qmCxOpw/oiIBEXaVbXC1JZ1RxxkyI
+OqZR+i44UzsJEkuKlrHGgr2mQcX+/LJWqIgObTb0DQBtWEjBVifac7Ak4HUuT5XQ
+1xgyhXLCt9d3A1gqVh6tKS9i6yBezvIeMxMPmbrCAlP6BPfs/HuRGxHnkHYS8X5s
+INg1ubRUTGTv/8QUpdWJYZpv3Oj4170y+QBMYwLvEGBkEhbDOpunFAb9MTefDknA
+AYxWFnKT1I/sby3OnGj3Y+/wmyvB2GQq9OsmMHYkHs1jCbWhVWVA78NfrrNGBzpQ
+LHu+GrdfBzUxqd6pOxBwB1O6fBpwARHvzxdYia6CZsDvaZMlROMmdDCBlfCvwI3y
+tatF7F9DjPEgVcvsbu9xseKhU4pDJ5v2AmdN/pAovQ2Tv/Lh+hXMMfWZ/kHt7qHF
+/J8HLt75dEEf7KrA5/hhuy6oYNx3sR1ug/v2XmUwHK1SqpVuJ8q2IiwBL4yH5jt8
+oPjBzrYxxxJbebAERqYaJN3y6LXUmn0O6uqGglJgPO65DLhVpLqso9NOK0U+95gl
+KVVBu86uE+QgcnfZs2cHVdiGi5G4kH3mlBNTnzc8onzN00LgKtiOfz4k7bdQ+zZm
+wESEH32Z788fgnWowao5zGmsezz3YcKD9YPAHRVXCCBv2u12pyMKeK7RzMmwz4Dz
+XYwderkCDQRaWIZfARAAyYIhzmU9nr/PRJG/r/LbOaoXosOXXUy2Ol4aaxkcFEfN
+olQ7iqSyXguhXSXUBy2yMZm3GcR/AEGN0oftNV8bSq9wPHiEGgJEEEDv2WSP5T57
+AaOEm9KXgzww0vhIzdkKTMq9cdPARQNK0nUEDDp18qPTjG+y/ItHIr7OKKmlGOEA
+v/jOzjO21t3RIuwN/8ahBpGEcYOlVKrvlek/6255XwIwU06dfTjdQPAeLuFuFLuh
+bZxlQcRsrXOhOigYUfh52whoiuuVRjkeRFk4IcqLORhW8QNiNJ56gM+VHi8fncDu
+SA7j0rwXj/eG3/LNfOzFxL4oK78lZ5Jjf6sYgkhjxcHKrCBbcbwNhKIMrThCYkYT
+R3lyFx5G1yjTy6mnPMSbu+weZZhJFHlunHs0iS1sosLaAzzCUIw0kx7FKIFSyBvv
+EkYpvC0c4XY2zztd7M644nsdvIMEr5XHHL/I8+fXiT4qtLBmRcD6x9gZDnlneqQb
+1RHO2pUHve/mHMK9hPR6lrs/7HEGksyYYLMHRfI0bsyeeJ+NuUjh3WJ7A43nTE4e
+e75Hwy3f2WA3L5IgymgZe9KX5lpet6SatnOuhYs2VUzZ54kQCuc5yu7oDNHlnY9Q
+GWxwWtBmyh/+hiGdtZTPVkxyDQHraidTXGFZ4yT3XyvvjUl7eMRQZBBcpFTFSdMA
+EQEAAYkCHwQYAQIACQUCWliGXwIbDAAKCRCMe48A5D90LtdjD/wLxNCYtDqxzgv3
+VyR01irsvK+CJJtnGPBIkfHO2/eCpPTtOdA5pUA8jyTE5LFIFSyhrC03pF70KKMs
+EiOZ0LPiaXmvUtH0sMstXkzV7IqDI/V0cKVNFzp5rG8PrNGfDtNtZtyVdbqTKUFz
+hDo9csgGsS9MRfH2Xhm33nBrHVwfRBFDgtz8+f/pU3YrsoU8TzfXIJwhu5cEU4bt
+TewZPYJPrSmY1kszJPJYAh+wRUwz4z10eIffDPOyQs+yMC+zj1sMAtsxjeKAyN1J
+2l4P/afeLv1bcgJwbXczzCJT80HAAqg5SlL7NkWrjKrjETDZMld2pFKdqmhJVxf2
+E3Os5cqMfLMGqGeFr0hf2ZcBXt1o4g0byLvoJXAQGi71SAxoUnSYnlWQtRNTnw1k
+9VeKqBATQK+eKcKZhi6ul7rZIaJKK2a7qk8D+SH0uaKEuvnNJosERV3f/Lr42Cji
+mYQSCcCSZhxzVWLWC/RFyxziCOMZdcWkQpae7FakyThjkFgQ1WGdnUVGDsa58fK+
+kvSiXvo7PDI4YXPnLi9z7IhmahSFWxrKbWbeQV+YH68tu8PSBF8P1U1X+Fcfyjh7
+8lFeLAgz3JCf3lFt+1cs2Ew07GovmzvtvvtTbolIkF+hy06zUg5UO+sHNB0tVuAa
+SBFljvVpDi+8+QfuCSYJYlKOjcAdlw==
+=zTAq
+-----END PGP PUBLIC KEY BLOCK-----
[3/3] celix git commit: CELIX-412: Adds missing AL comments,
based on the output of the apache rat tool
Posted by pn...@apache.org.
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/release/2.1.0
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"
[2/3] celix git commit: Merge branch 'develop' into release/2.1.0
Posted by pn...@apache.org.
Merge branch 'develop' into release/2.1.0
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/c5c30a33
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/c5c30a33
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/c5c30a33
Branch: refs/heads/release/2.1.0
Commit: c5c30a33ff5f52ea2c144320ffb3e3717095b366
Parents: 8821cfa d7307ff
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Mon Jan 15 11:31:26 2018 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Mon Jan 15 11:31:26 2018 +0100
----------------------------------------------------------------------
KEYS | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
----------------------------------------------------------------------