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 2019/05/16 02:57:56 UTC
[camel] branch master updated: CAMEL-13444 Renaming package
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 186618a CAMEL-13444 Renaming package
186618a is described below
commit 186618a36007c1fb18f1beae3ff9aacf3e0905d0
Author: Dimitrios Liapis <di...@gmail.com>
AuthorDate: Thu May 16 00:52:53 2019 +0200
CAMEL-13444 Renaming package
---
examples/camel-example-pojo-messaging/pom.xml | 2 +-
.../{pojo_messaging => pojo}/DistributeRecordsBean.java | 4 ++--
.../{pojo_messaging => pojo}/SendFileRecordsToQueueBean.java | 2 +-
.../src/main/resources/META-INF/spring/camel-context.xml | 4 ++--
.../example/{pojo_messaging => pojo}/CamelContextTest.java | 10 +++++-----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index e9fbff8..6d44e52 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -38,7 +38,7 @@
<category>Beginner</category>
<title>POJO Routing</title>
- <camel.osgi.export.pkg>org.apache.camel.example.pojo_messaging.*</camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>org.apache.camel.example.pojo.*</camel.osgi.export.pkg>
<camel.osgi.import.additional>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool
</camel.osgi.import.additional>
</properties>
diff --git a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java b/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/DistributeRecordsBean.java
similarity index 96%
rename from examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java
rename to examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/DistributeRecordsBean.java
index bacfec0..c62834e 100644
--- a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java
+++ b/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/DistributeRecordsBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.example.pojo_messaging;
+package org.apache.camel.example.pojo;
import org.apache.camel.Consume;
import org.apache.camel.RecipientList;
@@ -32,7 +32,7 @@ public class DistributeRecordsBean {
public String[] route(@XPath("/person/city/text()") String city) {
if (city.equals("London")) {
LOG.info("Person is from EMEA region");
- return new String[] {"file:target/messages/emea/hr_pickup",
+ return new String[] {"file:target/messages/emea/hr_pickup",
"file:target/messages/emea/finance_pickup"};
} else {
LOG.info("Person is from AMER region");
diff --git a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java b/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/SendFileRecordsToQueueBean.java
similarity index 96%
rename from examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java
rename to examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/SendFileRecordsToQueueBean.java
index f1d1dd9..924aea7 100644
--- a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java
+++ b/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/SendFileRecordsToQueueBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.example.pojo_messaging;
+package org.apache.camel.example.pojo;
import org.apache.camel.Consume;
import org.apache.camel.Header;
diff --git a/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
index 9c20c2b..855164c 100644
--- a/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
+++ b/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
@@ -45,8 +45,8 @@
<!-- END SNIPPET: activemq -->
<!-- START SNIPPET: ex -->
- <bean class="org.apache.camel.example.pojo_messaging.SendFileRecordsToQueueBean"/>
- <bean class="org.apache.camel.example.pojo_messaging.DistributeRecordsBean"/>
+ <bean class="org.apache.camel.example.pojo.SendFileRecordsToQueueBean"/>
+ <bean class="org.apache.camel.example.pojo.DistributeRecordsBean"/>
<!-- depend on the broker so Spring will shutdown the embedded broker after Camel -->
<camelContext xmlns="http://camel.apache.org/schema/spring" depends-on="broker"/>
diff --git a/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo_messaging/CamelContextTest.java b/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo/CamelContextTest.java
similarity index 95%
rename from examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo_messaging/CamelContextTest.java
rename to examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo/CamelContextTest.java
index 44a9d1f..78b2dbc 100644
--- a/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo_messaging/CamelContextTest.java
+++ b/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo/CamelContextTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.example.pojo_messaging;
+package org.apache.camel.example.pojo;
import java.io.File;
@@ -25,13 +25,13 @@ import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CamelContextTest extends CamelSpringTestSupport {
-
+
@Before
public void setUp() throws Exception {
deleteDirectory("target/messages");
super.setUp();
}
-
+
@Test
public void testCheckFiles() throws Exception {
// wait a little for the files to be picked up and processed
@@ -42,11 +42,11 @@ public class CamelContextTest extends CamelSpringTestSupport {
assertEquals("There should be 1 dumped files", 1, file.list().length);
file = new File("target/messages/amer/hr_pickup");
assertTrue("The pickup folder should exists", file.exists());
- assertEquals("There should be 2 dumped files", 2, file.list().length);
+ assertEquals("There should be 2 dumped files", 2, file.list().length);
}
@Override
- protected AbstractXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("META-INF/spring/camel-context.xml");
}