This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 21312b0 Camel-Jasypt: Removed refs to camel-test-blueprint
(camel-karaf migration)
21312b0 is described below
commit 21312b0e0e8aff0a977cc9996de930a65c7f91d0
Author: Andrea Cosentino <[email protected]>
AuthorDate: Tue Mar 24 12:09:24 2020 +0100
Camel-Jasypt: Removed refs to camel-test-blueprint (camel-karaf migration)
---
components/camel-jasypt/pom.xml | 5 ---
.../jasypt/BlueprintJasyptProperties2Test.java | 37 ----------------
.../jasypt/BlueprintJasyptProperties3Test.java | 37 ----------------
.../jasypt/BlueprintJasyptPropertiesTest.java | 37 ----------------
.../jasypt/BlueprintJasyptProperties2Test.xml | 42 ------------------
.../jasypt/BlueprintJasyptProperties3Test.xml | 50 ----------------------
.../jasypt/BlueprintJasyptPropertiesTest.xml | 48 ---------------------
7 files changed, 256 deletions(-)
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index e4de0f0..e804b8a 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -59,11 +59,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-blueprint</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git
a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.java
b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.java
deleted file mode 100644
index 6fd1afd..0000000
---
a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.java
+++ /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.
- */
-package org.apache.camel.component.jasypt;
-
-import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
-import org.junit.Test;
-
-public class BlueprintJasyptProperties2Test extends CamelBlueprintTestSupport {
-
- @Test
- public void testJasyptProperties() throws Exception {
- getMockEndpoint("mock:tiger").expectedBodiesReceived("Hello World");
-
- template.sendBody("direct:start", "Hello World");
-
- assertMockEndpointsSatisfied();
- }
-
- @Override
- protected String getBlueprintDescriptor() {
- return
"org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.xml";
- }
-}
diff --git
a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.java
b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.java
deleted file mode 100644
index 4aa870b..0000000
---
a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.java
+++ /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.
- */
-package org.apache.camel.component.jasypt;
-
-import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
-import org.junit.Test;
-
-public class BlueprintJasyptProperties3Test extends CamelBlueprintTestSupport {
-
- @Test
- public void testJasyptProperties() throws Exception {
- getMockEndpoint("mock:tiger").expectedBodiesReceived("Hello World");
-
- template.sendBody("direct:start", "Hello World");
-
- assertMockEndpointsSatisfied();
- }
-
- @Override
- protected String getBlueprintDescriptor() {
- return
"org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.xml";
- }
-}
diff --git
a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.java
b/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.java
deleted file mode 100644
index 26ed9f4..0000000
---
a/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.java
+++ /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.
- */
-package org.apache.camel.component.jasypt;
-
-import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
-import org.junit.Test;
-
-public class BlueprintJasyptPropertiesTest extends CamelBlueprintTestSupport {
-
- @Test
- public void testJasyptProperties() throws Exception {
- getMockEndpoint("mock:tiger").expectedBodiesReceived("Hello World");
-
- template.sendBody("direct:start", "Hello World");
-
- assertMockEndpointsSatisfied();
- }
-
- @Override
- protected String getBlueprintDescriptor() {
- return
"org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.xml";
- }
-}
diff --git
a/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.xml
b/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.xml
deleted file mode 100644
index 01ac549..0000000
---
a/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";
- xsi:schemaLocation="
- http://www.osgi.org/xmlns/blueprint/v1.0.0
https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";>
-
- <!-- define the jasypt properties parser with the given password to be
used -->
- <bean id="jasypt"
class="org.apache.camel.component.jasypt.JasyptPropertiesParser">
- <property name="password" value="secret"/>
- </bean>
-
- <camelContext xmlns="http://camel.apache.org/schema/blueprint";>
- <!-- define the camel properties placeholder, and let it leverage jasypt
-->
- <propertyPlaceholder id="properties"
-
location="classpath:org/apache/camel/component/jasypt/myproperties.properties"
- propertiesParserRef="jasypt"/>
- <route>
- <from uri="direct:start"/>
- <to uri="{{cool.result}}"/>
- </route>
- </camelContext>
-
-</blueprint>
diff --git
a/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.xml
b/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.xml
deleted file mode 100644
index c3ef2e7..0000000
---
a/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";
- xsi:schemaLocation="
- http://www.osgi.org/xmlns/blueprint/v1.0.0
https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";>
-
- <cm:property-placeholder id="myblue" persistent-id="mypersistent">
- <!-- list some properties for this test -->
- <cm:default-properties>
- <cm:property name="cool.result" value="mock:{{cool.password}}"/>
- <cm:property name="cool.password"
value="ENC(bsW9uV37gQ0QHFu7KO03Ww==)"/>
- </cm:default-properties>
- </cm:property-placeholder>
-
- <!-- define the jasypt properties parser with the given password to be
used -->
- <bean id="jasypt"
class="org.apache.camel.component.jasypt.JasyptPropertiesParser">
- <property name="password" value="secret"/>
- </bean>
-
- <camelContext xmlns="http://camel.apache.org/schema/blueprint";>
- <!-- define the camel properties placeholder, and let it leverage jasypt
-->
- <propertyPlaceholder id="properties"
- location="blueprint:myblue"
- propertiesParserRef="jasypt"/>
- <route>
- <from uri="direct:start"/>
- <to uri="{{cool.result}}"/>
- </route>
- </camelContext>
-
-</blueprint>
diff --git
a/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.xml
b/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.xml
deleted file mode 100644
index 4d7ed98..0000000
---
a/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";
- xsi:schemaLocation="
- http://www.osgi.org/xmlns/blueprint/v1.0.0
https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";>
-
- <!-- START SNIPPET: e1 -->
- <!-- define the jasypt properties parser with the given password to be
used -->
- <bean id="jasypt"
class="org.apache.camel.component.jasypt.JasyptPropertiesParser">
- <property name="password" value="secret"/>
- </bean>
-
- <!-- define the camel properties component -->
- <bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent">
- <!-- the properties file is in the classpath -->
- <property name="location"
value="classpath:org/apache/camel/component/jasypt/myproperties.properties"/>
- <!-- and let it leverage the jasypt parser -->
- <property name="propertiesParser" ref="jasypt"/>
- </bean>
- <!-- END SNIPPET: e1 -->
-
- <camelContext xmlns="http://camel.apache.org/schema/blueprint";>
- <route>
- <from uri="direct:start"/>
- <to uri="{{cool.result}}"/>
- </route>
- </camelContext>
-
-</blueprint>
