camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r896874 - in /camel/trunk/examples/camel-example-etl: pom.xml src/profiles/eclipselink/META-INF/spring/camel-context.xml src/profiles/hibernate/META-INF/spring/camel-context.xml src/profiles/openjpa/META-INF/spring/camel-context.xml
Date Thu, 07 Jan 2010 13:23:07 GMT
Author: davsclaus
Date: Thu Jan  7 13:21:30 2010
New Revision: 896874

URL: http://svn.apache.org/viewvc?rev=896874&view=rev
Log:
Fixed ETL example and whiched default profile to OpenJPA

Modified:
    camel/trunk/examples/camel-example-etl/pom.xml
    camel/trunk/examples/camel-example-etl/src/profiles/eclipselink/META-INF/spring/camel-context.xml
    camel/trunk/examples/camel-example-etl/src/profiles/hibernate/META-INF/spring/camel-context.xml
    camel/trunk/examples/camel-example-etl/src/profiles/openjpa/META-INF/spring/camel-context.xml

Modified: camel/trunk/examples/camel-example-etl/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/pom.xml?rev=896874&r1=896873&r2=896874&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ camel/trunk/examples/camel-example-etl/pom.xml Thu Jan  7 13:21:30 2010
@@ -127,9 +127,6 @@
 	<profiles>
 		<profile>
 			<id>hibernate</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<properties>
 				<camel.osgi.import.additional>
 					org.hsqldb,
@@ -161,6 +158,9 @@
 		</profile>
 		<profile>
 			<id>openjpa</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
 			<build>
 				<resources>
 					<resource>

Modified: camel/trunk/examples/camel-example-etl/src/profiles/eclipselink/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/profiles/eclipselink/META-INF/spring/camel-context.xml?rev=896874&r1=896873&r2=896874&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/src/profiles/eclipselink/META-INF/spring/camel-context.xml
(original)
+++ camel/trunk/examples/camel-example-etl/src/profiles/eclipselink/META-INF/spring/camel-context.xml
Thu Jan  7 13:21:30 2010
@@ -60,7 +60,8 @@
 	</bean>
 
 
-	<!-- lets show a simple UI to browse the database 
+    <!-- This bean will cause OSGi server exit , so we disable it here -->
+	<!-- lets show a simple UI to browse the database
 	<bean id="databaseExplorer" class="org.apache.camel.spring.util.MainRunner"
 		lazy-init="false">
 		<property name="main" value="org.hsqldb.util.DatabaseManagerSwing" />

Modified: camel/trunk/examples/camel-example-etl/src/profiles/hibernate/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/profiles/hibernate/META-INF/spring/camel-context.xml?rev=896874&r1=896873&r2=896874&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/src/profiles/hibernate/META-INF/spring/camel-context.xml
(original)
+++ camel/trunk/examples/camel-example-etl/src/profiles/hibernate/META-INF/spring/camel-context.xml
Thu Jan  7 13:21:30 2010
@@ -69,17 +69,18 @@
         <property name="password" value="" />
   </bean>
 
-  <!-- lets show a simple UI to browse the database -->
+  <!-- lets show a simple UI to browse the database, url should be - -url without the
space -->
   <!-- This bean will cause OSGi server exit , so we disable it here -->
+  <!--
   <bean id="databaseExplorer" class="org.apache.camel.spring.util.MainRunner" lazy-init="false">
     <property name="main" value="org.hsqldb.util.DatabaseManagerSwing"/>
     <property name="args">
       <list>
-        <value>--url</value>
+        <value>- -url</value>
         <value>jdbc:hsqldb:mem:camel_etl</value>
       </list>
     </property>
     <property name="delay" value="1000"/>
   </bean>
-
+  -->
 </beans>

Modified: camel/trunk/examples/camel-example-etl/src/profiles/openjpa/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/profiles/openjpa/META-INF/spring/camel-context.xml?rev=896874&r1=896873&r2=896874&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/src/profiles/openjpa/META-INF/spring/camel-context.xml
(original)
+++ camel/trunk/examples/camel-example-etl/src/profiles/openjpa/META-INF/spring/camel-context.xml
Thu Jan  7 13:21:30 2010
@@ -65,17 +65,19 @@
 	</bean>
 
 
+    <!-- This bean will cause OSGi server exit , so we disable it here -->
 	<!-- lets show a simple UI to browse the database -->
+    <!--
 	<bean id="databaseExplorer" class="org.apache.camel.spring.util.MainRunner"
 		lazy-init="false">
 		<property name="main" value="org.hsqldb.util.DatabaseManagerSwing" />
 		<property name="args">
 			<list>
-				<value>--url</value>
+				<value>- -url</value>
 				<value>jdbc:hsqldb:mem:camel_etl</value>
 			</list>
 		</property>
 		<property name="delay" value="3000" />
 	</bean>
-
+    -->
 </beans>
\ No newline at end of file



Mime
View raw message