Author: davsclaus
Date: Mon Jun 16 09:25:43 2008
New Revision: 668224
URL: http://svn.apache.org/viewvc?rev=668224&view=rev
Log:
TODOs added to pom.xml. Added missing SVN properties
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
(contents, props changed)
Modified: activemq/camel/trunk/camel-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=668224&r1=668223&r2=668224&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Mon Jun 16 09:25:43 2008
@@ -42,11 +42,21 @@
</properties>
<dependencies>
+
+ <!-- required dependencies by camel-core -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</dependency>
+ <dependency>
+ <!-- TODO: this is only needed for OSGi environments, can we have it be
optional or how? -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${felix-osgi-version}</version>
+ </dependency>
+
+ <!-- TODO: Javax Activation (attachment support) is now also a hard
dependency, where do we configure this in pom.xml? -->
<!-- to allow Spring annotations to be used -->
<dependency>
@@ -84,11 +94,6 @@
<version>${spring-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${felix-osgi-version}</version>
- </dependency>
</dependencies>
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java?rev=668224&r1=668223&r2=668224&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
Mon Jun 16 09:25:43 2008
@@ -1,55 +1,55 @@
-/**
- * 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.dataset;
-
-import javax.naming.Context;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.builder.RouteBuilder;
-
-/**
- * Unit test to demonstrate high concurrency with seda. Offspring by CAMEL-605.
- */
-public class DataSetSedaTest extends ContextTestSupport {
- private SimpleDataSet dataSet = new SimpleDataSet(500);
-
- public void test() throws Exception {
- MockEndpoint endpoint = getMockEndpoint("dataset:foo");
- endpoint.expectedMessageCount((int) dataSet.getSize());
-
- assertMockEndpointsSatisifed();
- }
-
- @Override
- protected Context createJndiContext() throws Exception {
- Context context = super.createJndiContext();
- context.bind("foo", dataSet);
- return context;
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() throws Exception {
- from("dataset:foo").to("seda:queue:test");
- from("seda:queue:test").to("dataset:foo");
- }
- };
- }
-
-}
+/**
+ * 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.dataset;
+
+import javax.naming.Context;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Unit test to demonstrate high concurrency with seda. Offspring by CAMEL-605.
+ */
+public class DataSetSedaTest extends ContextTestSupport {
+ private SimpleDataSet dataSet = new SimpleDataSet(500);
+
+ public void test() throws Exception {
+ MockEndpoint endpoint = getMockEndpoint("dataset:foo");
+ endpoint.expectedMessageCount((int) dataSet.getSize());
+
+ assertMockEndpointsSatisifed();
+ }
+
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("dataset:foo").to("seda:queue:test");
+ from("seda:queue:test").to("dataset:foo");
+ }
+ };
+ }
+
+}
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
