You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/09/15 18:01:04 UTC
svn commit: r1171156 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/main/
camel-core/src/test/java/org/apache/camel/impl/
components/camel-guice/src/main/java/org/apache/camel/guice/
Author: cschneider
Date: Thu Sep 15 16:01:04 2011
New Revision: 1171156
URL: http://svn.apache.org/viewvc?rev=1171156&view=rev
Log:
CAMEL-4357 Also moving MainSupport to main as it needs the same references like the view package
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/main/MainSupport.java (contents, props changed)
- copied, changed from r1171101, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java?rev=1171156&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java Thu Sep 15 16:01:04 2011
@@ -0,0 +1,26 @@
+/**
+ * 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.impl;
+
+
+/**
+ * @deprecated
+ * @see org.apache.camel.main.MainSupport
+ */
+@Deprecated
+public abstract class MainSupport extends org.apache.camel.main.MainSupport {
+}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java?rev=1171156&r1=1171155&r2=1171156&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/main/Main.java Thu Sep 15 16:01:04 2011
@@ -23,7 +23,6 @@ import javax.xml.bind.JAXBException;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.MainSupport;
import org.apache.camel.view.ModelFileGenerator;
/**
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/main/MainSupport.java (from r1171101, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/main/MainSupport.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/main/MainSupport.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java&r1=1171101&r2=1171156&rev=1171156&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/main/MainSupport.java Thu Sep 15 16:01:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl;
+package org.apache.camel.main;
import java.io.IOException;
import java.util.ArrayList;
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -34,6 +33,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.support.ServiceSupport;
@@ -348,7 +348,7 @@ public abstract class MainSupport extend
public List<RouteDefinition> getRouteDefinitions() {
List<RouteDefinition> answer = new ArrayList<RouteDefinition>();
for (CamelContext camelContext : camelContexts) {
- answer.addAll(camelContext.getRouteDefinitions());
+ answer.addAll(((ModelCamelContext)camelContext).getRouteDefinitions());
}
return answer;
}
@@ -421,7 +421,7 @@ public abstract class MainSupport extend
if (camelContexts.size() == 1) {
return camelContexts.get(0);
} else {
- CamelContext answer = new DefaultCamelContext();
+ ModelCamelContext answer = new DefaultCamelContext();
for (CamelContext camelContext : camelContexts) {
answer.addRouteDefinitions(((ModelCamelContext)camelContext).getRouteDefinitions());
}
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java?rev=1171156&r1=1171155&r2=1171156&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MainSupportTest.java Thu Sep 15 16:01:04 2011
@@ -22,6 +22,7 @@ import javax.xml.bind.JAXBException;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.main.MainSupport;
import org.apache.camel.view.ModelFileGenerator;
/**
Modified: camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java?rev=1171156&r1=1171155&r2=1171156&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java (original)
+++ camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java Thu Sep 15 16:01:04 2011
@@ -35,7 +35,7 @@ import com.google.inject.internal.Maps;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.impl.MainSupport;
+import org.apache.camel.main.MainSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.ModelFileGenerator;
import org.guiceyfruit.Injectors;