Author: ningjiang
Date: Thu Nov 26 11:04:51 2009
New Revision: 884506

URL: http://svn.apache.org/viewvc?rev=884506&view=rev
Log:
CAMEL-2230 clean up the OSGi package import and export definition of the example

Modified:
    camel/trunk/examples/camel-example-cxf-async/pom.xml
    camel/trunk/examples/camel-example-cxf/pom.xml
    camel/trunk/examples/camel-example-etl/src/test/resources/log4j.properties
    camel/trunk/examples/camel-example-guice-jms/pom.xml
    camel/trunk/examples/camel-example-http-async/pom.xml
    camel/trunk/examples/camel-example-jms-file/pom.xml
    camel/trunk/examples/camel-example-loan-broker/pom.xml
    camel/trunk/examples/camel-example-management/pom.xml
    camel/trunk/examples/camel-example-pojo-messaging/pom.xml
    camel/trunk/examples/camel-example-route-throttling/pom.xml
    
camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
    
camel/trunk/examples/camel-example-route-throttling/src/main/resources/camel-client.xml
    camel/trunk/examples/camel-example-spring-jms/pom.xml
    camel/trunk/examples/camel-example-spring-xquery/pom.xml
    camel/trunk/examples/camel-example-spring/pom.xml
    camel/trunk/examples/camel-example-tracer/pom.xml

Modified: camel/trunk/examples/camel-example-cxf-async/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-async/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-async/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-async/pom.xml Thu Nov 26 11:04:51 
2009
@@ -26,9 +26,23 @@
     </parent>
 
     <artifactId>camel-example-cxf-async</artifactId>
+    <packaging>bundle</packaging>
     <name>Camel :: Example :: CXF :: Asynchronous request reply</name>
     <description>A client-server example using CXF webservice which is using 
non blocking asynchronous request/reply</description>
 
+    <properties>
+     <camel.osgi.export.pkg>
+       org.apache.camel.example.*      
+     </camel.osgi.export.pkg>
+     <camel.osgi.import.additional>
+        META-INF.cxf
+     </camel.osgi.import.additional>
+     <!-- to avoid us import bunch of cxf packages -->
+     <camel.osgi.dynamic>
+      *
+     </camel.osgi.dynamic>
+   </properties>
+   
     <dependencies>
         <dependency>
             <groupId>org.apache.camel</groupId>

Modified: camel/trunk/examples/camel-example-cxf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf/pom.xml Thu Nov 26 11:04:51 2009
@@ -35,14 +35,13 @@
   
    <properties>
      <camel.osgi.export.pkg>
-       org.apache.camel.example.cxf.*;${camel.osgi.version},
-       org.apache.camel.example.camel.transport.*;${camel.osgi.version}
+       org.apache.camel.example.*
      </camel.osgi.export.pkg>
-     <camel.osgi.import.pkg>
+     <camel.osgi.import.additional>
         META-INF.cxf,
-        
org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool,*</camel.osgi.import.pkg>
+        
org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool
+     </camel.osgi.import.additional>
      <camel.osgi.private.pkg>
-        org.apache.camel.example.jms,
         org.apache.hello_world_soap_http,
         org.apache.hello_world_soap_http.types
      </camel.osgi.private.pkg>

Modified: 
camel/trunk/examples/camel-example-etl/src/test/resources/log4j.properties
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/test/resources/log4j.properties?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/src/test/resources/log4j.properties 
(original)
+++ camel/trunk/examples/camel-example-etl/src/test/resources/log4j.properties 
Thu Nov 26 11:04:51 2009
@@ -32,5 +32,5 @@
 log4j.appender.file=org.apache.log4j.FileAppender
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - 
%m%n
-log4j.appender.file.file=target/camel-example-axis.log
+log4j.appender.file.file=target/camel-example-etl.log
 log4j.appender.file.append=true

Modified: camel/trunk/examples/camel-example-guice-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-guice-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-guice-jms/pom.xml Thu Nov 26 11:04:51 
2009
@@ -34,7 +34,7 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.example.guice.jms.*</camel.osgi.export.pkg>
-    
<camel.osgi.import.pkg>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool,*</camel.osgi.import.pkg>
+    
<camel.osgi.import.additional>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool</camel.osgi.import.additional>
     
<camel.osgi.activator>org.apache.camel.example.guice.jms.MyActivator</camel.osgi.activator>
   </properties>
 

Modified: camel/trunk/examples/camel-example-http-async/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-http-async/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-http-async/pom.xml (original)
+++ camel/trunk/examples/camel-example-http-async/pom.xml Thu Nov 26 11:04:51 
2009
@@ -26,9 +26,15 @@
     </parent>
 
     <artifactId>camel-example-http-async</artifactId>
+    <packaging>bundle</packaging>
     <name>Camel :: Example :: HTTP :: Asynchronous request reply</name>
     <description>A client-server example using HTTP transport which is using 
non blocking asynchronous request/reply</description>
 
+    <properties>
+       <camel.osgi.export.pkg>
+         org.apache.camel.example.client.*
+       </camel.osgi.export.pkg>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.camel</groupId>

Modified: camel/trunk/examples/camel-example-jms-file/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jms-file/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-jms-file/pom.xml (original)
+++ camel/trunk/examples/camel-example-jms-file/pom.xml Thu Nov 26 11:04:51 2009
@@ -34,7 +34,7 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.example.jmstofile.*</camel.osgi.export.pkg>
-    
<camel.osgi.import.pkg>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool,*</camel.osgi.import.pkg>
+    
<camel.osgi.import.additional>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool</camel.osgi.import.additional>
   </properties>
 
   <dependencies>

Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/pom.xml Thu Nov 26 11:04:51 
2009
@@ -33,10 +33,11 @@
 
   <properties>
     <camel.osgi.export.pkg>
-       org.apache.camel.loanbroker.queue.version;${camel.osgi.version},
-       org.apache.camel.loanbroker.webservice.version;${camel.osgi.version}    
   
+       org.apache.camel.loanbroker.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.import.pkg>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool,*</camel.osgi.import.pkg>
+    <camel.osgi.import.additional>
+       
org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool
+    </camel.osgi.import.additional>
   </properties>
     
    <dependencies>

Modified: camel/trunk/examples/camel-example-management/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-management/pom.xml (original)
+++ camel/trunk/examples/camel-example-management/pom.xml Thu Nov 26 11:04:51 
2009
@@ -35,7 +35,7 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.example.management.*</camel.osgi.export.pkg>
-        
<camel.osgi.import.pkg>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool,*</camel.osgi.import.pkg>
+        
<camel.osgi.import.additional>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool</camel.osgi.import.additional>
     </properties>
 
     <dependencies>

Modified: camel/trunk/examples/camel-example-pojo-messaging/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-pojo-messaging/pom.xml (original)
+++ camel/trunk/examples/camel-example-pojo-messaging/pom.xml Thu Nov 26 
11:04:51 2009
@@ -34,7 +34,7 @@
 
   <properties>
      
<camel.osgi.export.pkg>org.apache.camel.example.pojo_messaging.*</camel.osgi.export.pkg>
-     
<camel.osgi.import.pkg>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool,*</camel.osgi.import.pkg>
+     
<camel.osgi.import.additional>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool</camel.osgi.import.additional>
    </properties>
     
   <dependencies>

Modified: camel/trunk/examples/camel-example-route-throttling/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-route-throttling/pom.xml (original)
+++ camel/trunk/examples/camel-example-route-throttling/pom.xml Thu Nov 26 
11:04:51 2009
@@ -26,9 +26,15 @@
     </parent>
 
     <artifactId>camel-example-route-throttling</artifactId>
+    <packaging>bundle</packaging>
     <name>Camel :: Example :: Route :: Throttling</name>
     <description>A client-server example using JMS transport where we on the 
server side can throttle the Camel
         route dynamically based on the flow of messages</description>
+        
+    <properties>
+    
<camel.osgi.export.pkg>org.apache.camel.example.client.*</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>
 
     <dependencies>
         <dependency>

Modified: 
camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
 (original)
+++ 
camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
 Thu Nov 26 11:04:51 2009
@@ -81,7 +81,7 @@
 
     <broker:broker useJmx="false" persistent="true" brokerName="localhost" 
dataDirectory="target/data" useShutdownHook="true">
         <broker:transportConnectors>
-            <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
+            <broker:transportConnector name="tcp" uri="tcp://localhost:51616"/>
         </broker:transportConnectors>
     </broker:broker>
 

Modified: 
camel/trunk/examples/camel-example-route-throttling/src/main/resources/camel-client.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/src/main/resources/camel-client.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- 
camel/trunk/examples/camel-example-route-throttling/src/main/resources/camel-client.xml
 (original)
+++ 
camel/trunk/examples/camel-example-route-throttling/src/main/resources/camel-client.xml
 Thu Nov 26 11:04:51 2009
@@ -29,7 +29,7 @@
     </camel:camelContext>
 
     <bean id="jms" 
class="org.apache.activemq.camel.component.ActiveMQComponent">
-        <property name="brokerURL" value="tcp://localhost:61616"/>
+        <property name="brokerURL" value="tcp://localhost:51616"/>
     </bean>
 
 </beans>
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-spring-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-jms/pom.xml Thu Nov 26 11:04:51 
2009
@@ -33,7 +33,7 @@
     </description>
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.example.server.*</camel.osgi.export.pkg>
-        
<camel.osgi.import.pkg>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool,*</camel.osgi.import.pkg>
+        
<camel.osgi.import.additional>org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool</camel.osgi.import.additional>
     </properties>
 
     <dependencies>

Modified: camel/trunk/examples/camel-example-spring-xquery/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-xquery/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-xquery/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-xquery/pom.xml Thu Nov 26 
11:04:51 2009
@@ -33,7 +33,7 @@
   <description>An example using Spring XML to transform a message using 
XQuery</description>
 
   <properties>
-    <camel.osgi.export.pkg></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>
 
   <dependencies>

Modified: camel/trunk/examples/camel-example-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring/pom.xml Thu Nov 26 11:04:51 2009
@@ -34,6 +34,7 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.example.spring.*</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>
 
   <pluginRepositories>

Modified: camel/trunk/examples/camel-example-tracer/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/pom.xml?rev=884506&r1=884505&r2=884506&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-tracer/pom.xml (original)
+++ camel/trunk/examples/camel-example-tracer/pom.xml Thu Nov 26 11:04:51 2009
@@ -29,9 +29,13 @@
     </parent>
 
     <artifactId>camel-example-tracer</artifactId>
+    <packaging>bundle</packaging>
     <name>Camel :: Example :: Tracer</name>
     <description>An example showing how to persist Camel trace event messages 
using JPA</description>
 
+    <properties>
+      
<camel.osgi.export.pkg>org.apache.camel.example.tracer</camel.osgi.export.pkg>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.camel</groupId>


Reply via email to