Author: cschneider
Date: Mon Aug 22 12:36:51 2011
New Revision: 1160238
URL: http://svn.apache.org/viewvc?rev=1160238&view=rev
Log:
CAMEL-4357 Move Main class to package .main as it is not part of the camel API
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/main/
camel/trunk/camel-core/src/test/java/org/apache/camel/main/
camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainExample.java
- copied, changed from r1160237,
camel/trunk/camel-core/src/test/java/org/apache/camel/MainExample.java
camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java
- copied, changed from r1160237,
camel/trunk/camel-core/src/test/java/org/apache/camel/MainTest.java
Removed:
camel/trunk/camel-core/src/test/java/org/apache/camel/MainExample.java
camel/trunk/camel-core/src/test/java/org/apache/camel/MainTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Main.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Main.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Main.java?rev=1160238&r1=1160237&r2=1160238&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Main.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Main.java Mon Aug 22
12:36:51 2011
@@ -1,82 +1,9 @@
-/**
- * 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;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.bind.JAXBException;
-
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.MainSupport;
-import org.apache.camel.view.ModelFileGenerator;
-
-/**
- * A command line tool for booting up a CamelContext
- *
- * @version
- */
-public class Main extends MainSupport {
- protected static Main instance;
-
- public Main() {
- }
-
- public static void main(String... args) throws Exception {
- Main main = new Main();
- instance = main;
- main.enableHangupSupport();
- main.run(args);
- }
-
- /**
- * Returns the currently executing main
- *
- * @return the current running instance
- */
- public static Main getInstance() {
- return instance;
- }
-
- // Implementation methods
- //
-------------------------------------------------------------------------
-
- @Override
- protected void doStart() throws Exception {
- super.doStart();
- postProcessContext();
- getCamelContexts().get(0).start();
- }
-
- protected void doStop() throws Exception {
- super.doStop();
- getCamelContexts().get(0).stop();
- }
-
- protected ProducerTemplate findOrCreateCamelTemplate() {
- return getCamelContexts().get(0).createProducerTemplate();
- }
-
- protected Map<String, CamelContext> getCamelContextMap() {
- Map<String, CamelContext> answer = new HashMap<String, CamelContext>();
- answer.put("camel-1", new DefaultCamelContext());
- return answer;
- }
-
- protected ModelFileGenerator createModelFileGenerator() throws
JAXBException {
- return null;
- }
-}
+package org.apache.camel;
+
+/**
+ * @deprecated use org.apache.camel.main.Main instead
+ */
+@Deprecated
+public class Main extends org.apache.camel.main.Main {
+
+}
Copied:
camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainExample.java
(from r1160237,
camel/trunk/camel-core/src/test/java/org/apache/camel/MainExample.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainExample.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainExample.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/MainExample.java&r1=1160237&r2=1160238&rev=1160238&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/MainExample.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainExample.java
Mon Aug 22 12:36:51 2011
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.main;
import java.util.Date;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
/**
Copied:
camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java (from
r1160237, camel/trunk/camel-core/src/test/java/org/apache/camel/MainTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/MainTest.java&r1=1160237&r2=1160238&rev=1160238&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/MainTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/main/MainTest.java
Mon Aug 22 12:36:51 2011
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.main;
import java.util.List;
import junit.framework.TestCase;
+import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
