You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/10/05 17:59:52 UTC
[camel] branch camel-3.18.x updated: CAMEL-18579 Missing osgi import for CxfUtils in camel-cxf-rest (#8465)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new d548d843756 CAMEL-18579 Missing osgi import for CxfUtils in camel-cxf-rest (#8465)
d548d843756 is described below
commit d548d843756add0f9de4bd35056e5f1ebc045e2d
Author: Jan Filipski <gl...@users.noreply.github.com>
AuthorDate: Wed Oct 5 19:58:56 2022 +0200
CAMEL-18579 Missing osgi import for CxfUtils in camel-cxf-rest (#8465)
Unused cxf messages removed
---
.../camel/component/cxf/util/Messages.properties | 5 -----
components/camel-cxf/camel-cxf-rest/pom.xml | 2 +-
.../component/cxf/interceptors/Messages.properties | 26 ----------------------
.../camel/component/cxf/util/Messages.properties | 22 ------------------
.../component/cxf/interceptors/Messages.properties | 26 ----------------------
.../component/cxf/interceptors/Messages.properties | 26 ----------------------
.../camel/component/cxf/util/Messages.properties | 22 ------------------
7 files changed, 1 insertion(+), 128 deletions(-)
diff --git a/components/camel-cxf/camel-cxf-common/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties b/components/camel-cxf/camel-cxf-common/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties
index ea5e37339e8..7d27a1533b6 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties
+++ b/components/camel-cxf/camel-cxf-common/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties
@@ -14,9 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-SVC_WSDL_URL_IS_NULL_X = Unable to locate WSDL from URI {0} due to WSDL not found.
-CLASS_X_NOT_FOUND = Failed to load service class due to {0}.
-SVC_QNAME_NOT_FOUND_X = Service QName is not provided in the URI {0} nor in the endpoint's property.
-INVALID_MESSAGE_FORMAT_XXXX = {0} is an invalid value for messageFormat. Please choose from: POJO, PAYLOAD, or MESSAGE.
-SVC_CLASS_PROP_IS_REQUIRED_X = Service Class property is expected for this endpoint {0}
XMLSTREAM_EXCEPTION = XML stream exception: {0}.
diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml
index 54fcb145074..926c2dd9c1d 100644
--- a/components/camel-cxf/camel-cxf-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-rest/pom.xml
@@ -44,7 +44,6 @@
!org.apache.camel.component.cxf.interceptors,
!org.apache.camel.component.cxf.jaxrs,
!org.apache.camel.component.cxf.spring,
- !org.apache.camel.component.cxf.util,
!org.apache.camel.blueprint,
javax.activation.*;version="${javax-activation-version-range}",
javax.jws*;version="[0.0,3)";resolution:=optional,
@@ -67,6 +66,7 @@
org.apache.camel.blueprint;resolution:=optional,
*
</camel.osgi.import>
+ <camel.osgi.private.pkg />
<camel.osgi.failok>true</camel.osgi.failok>
</properties>
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties b/components/camel-cxf/camel-cxf-rest/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties
deleted file mode 100644
index 973db8603ef..00000000000
--- a/components/camel-cxf/camel-cxf-rest/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties
+++ /dev/null
@@ -1,26 +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.
-## ---------------------------------------------------------------------------
-STREAM_CREATE_EXC = Could not create XMLStreamReader.
-STAX_READ_EXC = Could not read from XMLStreamReader.
-STAX_WRITE_EXC = Could not write from XMLStreamReader.
-NO_OPERATION_ELEMENT=There must be an operation element.
-NO_OPERATION=No such operation: {0}
-UNKNOWN_EXCEPTION=Could not recogonize exception type: {0}
-REQ_NOT_UNDERSTOOD=Could not read request. Operation {0} is unknown.
-ILLEAGAL_XMLFAULT_FORMAT=Illeagal xml fault message format.
-MULTIPLE_HDR_PARTS=Multiple header parts found for part name {0}.
-NOT_SUPPORTED_MESSAGE=Message {0} not supported in Payload mode Routing.
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties b/components/camel-cxf/camel-cxf-rest/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties
deleted file mode 100644
index ea5e37339e8..00000000000
--- a/components/camel-cxf/camel-cxf-rest/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties
+++ /dev/null
@@ -1,22 +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.
-## ---------------------------------------------------------------------------
-SVC_WSDL_URL_IS_NULL_X = Unable to locate WSDL from URI {0} due to WSDL not found.
-CLASS_X_NOT_FOUND = Failed to load service class due to {0}.
-SVC_QNAME_NOT_FOUND_X = Service QName is not provided in the URI {0} nor in the endpoint's property.
-INVALID_MESSAGE_FORMAT_XXXX = {0} is an invalid value for messageFormat. Please choose from: POJO, PAYLOAD, or MESSAGE.
-SVC_CLASS_PROP_IS_REQUIRED_X = Service Class property is expected for this endpoint {0}
-XMLSTREAM_EXCEPTION = XML stream exception: {0}.
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties b/components/camel-cxf/camel-cxf-soap/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties
deleted file mode 100644
index 973db8603ef..00000000000
--- a/components/camel-cxf/camel-cxf-soap/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties
+++ /dev/null
@@ -1,26 +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.
-## ---------------------------------------------------------------------------
-STREAM_CREATE_EXC = Could not create XMLStreamReader.
-STAX_READ_EXC = Could not read from XMLStreamReader.
-STAX_WRITE_EXC = Could not write from XMLStreamReader.
-NO_OPERATION_ELEMENT=There must be an operation element.
-NO_OPERATION=No such operation: {0}
-UNKNOWN_EXCEPTION=Could not recogonize exception type: {0}
-REQ_NOT_UNDERSTOOD=Could not read request. Operation {0} is unknown.
-ILLEAGAL_XMLFAULT_FORMAT=Illeagal xml fault message format.
-MULTIPLE_HDR_PARTS=Multiple header parts found for part name {0}.
-NOT_SUPPORTED_MESSAGE=Message {0} not supported in Payload mode Routing.
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties
deleted file mode 100644
index 973db8603ef..00000000000
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/org/apache/camel/component/cxf/interceptors/Messages.properties
+++ /dev/null
@@ -1,26 +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.
-## ---------------------------------------------------------------------------
-STREAM_CREATE_EXC = Could not create XMLStreamReader.
-STAX_READ_EXC = Could not read from XMLStreamReader.
-STAX_WRITE_EXC = Could not write from XMLStreamReader.
-NO_OPERATION_ELEMENT=There must be an operation element.
-NO_OPERATION=No such operation: {0}
-UNKNOWN_EXCEPTION=Could not recogonize exception type: {0}
-REQ_NOT_UNDERSTOOD=Could not read request. Operation {0} is unknown.
-ILLEAGAL_XMLFAULT_FORMAT=Illeagal xml fault message format.
-MULTIPLE_HDR_PARTS=Multiple header parts found for part name {0}.
-NOT_SUPPORTED_MESSAGE=Message {0} not supported in Payload mode Routing.
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties b/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties
deleted file mode 100644
index ea5e37339e8..00000000000
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/resources/org/apache/camel/component/cxf/util/Messages.properties
+++ /dev/null
@@ -1,22 +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.
-## ---------------------------------------------------------------------------
-SVC_WSDL_URL_IS_NULL_X = Unable to locate WSDL from URI {0} due to WSDL not found.
-CLASS_X_NOT_FOUND = Failed to load service class due to {0}.
-SVC_QNAME_NOT_FOUND_X = Service QName is not provided in the URI {0} nor in the endpoint's property.
-INVALID_MESSAGE_FORMAT_XXXX = {0} is an invalid value for messageFormat. Please choose from: POJO, PAYLOAD, or MESSAGE.
-SVC_CLASS_PROP_IS_REQUIRED_X = Service Class property is expected for this endpoint {0}
-XMLSTREAM_EXCEPTION = XML stream exception: {0}.