You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2006/02/22 00:40:29 UTC
svn commit: r379627 [26/34] - in /incubator/servicemix/trunk: ./ etc/
sandbox/servicemix-wsn-1.2/src/sa/META-INF/
sandbox/servicemix-wsn-1.2/src/su/META-INF/ servicemix-assembly/
servicemix-assembly/src/main/assembly/ servicemix-assembly/src/main/relea...
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml Tue Feb 21 15:40:05 2006
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <wsnt:ConsumerReference>
- <wsa:Address>
- http://www.consumer.org/ConsumerEndpoint
- </wsa:Address>
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
- npex:SomeTopic
- </wsnt:TopicExpression>
- <wsnt:MessageContent Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116">
- boolean(ncex:Producer="15")
- </wsnt:MessageContent>
- </wsnt:Filter>
- <wsnt:InitialTerminationTime />
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <wsnt:ConsumerReference>
+ <wsa:Address>
+ http://www.consumer.org/ConsumerEndpoint
+ </wsa:Address>
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
+ npex:SomeTopic
+ </wsnt:TopicExpression>
+ <wsnt:MessageContent Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116">
+ boolean(ncex:Producer="15")
+ </wsnt:MessageContent>
+ </wsnt:Filter>
+ <wsnt:InitialTerminationTime />
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-empty-itt.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml Tue Feb 21 15:40:05 2006
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org">
- <wsnt:ConsumerReference>
- <end-point-reference xmlns="http://java.sun.com/xml/ns/jbi"
- service-name="ncex:myService" end-point-name="myEndpoint" />
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
- npex:SomeTopic
- </wsnt:TopicExpression>
- </wsnt:Filter>
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org">
+ <wsnt:ConsumerReference>
+ <end-point-reference xmlns="http://java.sun.com/xml/ns/jbi"
+ service-name="ncex:myService" end-point-name="myEndpoint" />
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
+ npex:SomeTopic
+ </wsnt:TopicExpression>
+ </wsnt:Filter>
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-epr.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml Tue Feb 21 15:40:05 2006
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <wsnt:ConsumerReference>
- <wsa:Address>
- http://www.consumer.org/ConsumerEndpoint
- </wsa:Address>
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
- npex:SomeTopic
- </wsnt:TopicExpression>
- <wsnt:MessageContent Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116">
- boolean(ncex:Producer="15")
- </wsnt:MessageContent>
- </wsnt:Filter>
- <wsnt:InitialTerminationTime xsi:nil="true" />
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <wsnt:ConsumerReference>
+ <wsa:Address>
+ http://www.consumer.org/ConsumerEndpoint
+ </wsa:Address>
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
+ npex:SomeTopic
+ </wsnt:TopicExpression>
+ <wsnt:MessageContent Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116">
+ boolean(ncex:Producer="15")
+ </wsnt:MessageContent>
+ </wsnt:Filter>
+ <wsnt:InitialTerminationTime xsi:nil="true" />
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-nil-itt.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml Tue Feb 21 15:40:05 2006
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org">
- <wsnt:ConsumerReference>
- <wsa:Address>
- http://www.consumer.org/ConsumerEndpoint
- </wsa:Address>
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
- npex:SomeTopic
- </wsnt:TopicExpression>
- <wsnt:MessageContent Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116">
- boolean(ncex:Producer="15")
- </wsnt:MessageContent>
- </wsnt:Filter>
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org">
+ <wsnt:ConsumerReference>
+ <wsa:Address>
+ http://www.consumer.org/ConsumerEndpoint
+ </wsa:Address>
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
+ npex:SomeTopic
+ </wsnt:TopicExpression>
+ <wsnt:MessageContent Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116">
+ boolean(ncex:Producer="15")
+ </wsnt:MessageContent>
+ </wsnt:Filter>
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-itt.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml Tue Feb 21 15:40:05 2006
@@ -1,14 +1,14 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org">
- <wsnt:ConsumerReference>
- <wsa:Address>
- http://www.consumer.org/ConsumerEndpoint
- </wsa:Address>
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- </wsnt:Filter>
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org">
+ <wsnt:ConsumerReference>
+ <wsa:Address>
+ http://www.consumer.org/ConsumerEndpoint
+ </wsa:Address>
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ </wsnt:Filter>
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-no-topic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml Tue Feb 21 15:40:05 2006
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org">
- <wsnt:ConsumerReference>
- <wsa:Address>
- http://www.consumer.org/ConsumerEndpoint
- </wsa:Address>
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
- npex:SomeTopic
- </wsnt:TopicExpression>
- <wsnt:ProducerProperties>
- </wsnt:ProducerProperties>
- <wsnt:MessageContent Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116">
- boolean(ncex:Producer="15")
- </wsnt:MessageContent>
- </wsnt:Filter>
- <wsnt:SubscriptionPolicy>
- <wsnt:UseRaw />
- </wsnt:SubscriptionPolicy>
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org">
+ <wsnt:ConsumerReference>
+ <wsa:Address>
+ http://www.consumer.org/ConsumerEndpoint
+ </wsa:Address>
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
+ npex:SomeTopic
+ </wsnt:TopicExpression>
+ <wsnt:ProducerProperties>
+ </wsnt:ProducerProperties>
+ <wsnt:MessageContent Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116">
+ boolean(ncex:Producer="15")
+ </wsnt:MessageContent>
+ </wsnt:Filter>
+ <wsnt:SubscriptionPolicy>
+ <wsnt:UseRaw />
+ </wsnt:SubscriptionPolicy>
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-pp.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml Tue Feb 21 15:40:05 2006
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org">
- <wsnt:ConsumerReference>
- <wsa:Address>
- http://www.consumer.org/ConsumerEndpoint
- </wsa:Address>
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
- npex:SomeTopic
- </wsnt:TopicExpression>
- </wsnt:Filter>
- <wsnt:SubscriptionPolicy>
- <wsnt:UseRaw />
- </wsnt:SubscriptionPolicy>
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org">
+ <wsnt:ConsumerReference>
+ <wsa:Address>
+ http://www.consumer.org/ConsumerEndpoint
+ </wsa:Address>
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
+ npex:SomeTopic
+ </wsnt:TopicExpression>
+ </wsnt:Filter>
+ <wsnt:SubscriptionPolicy>
+ <wsnt:UseRaw />
+ </wsnt:SubscriptionPolicy>
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/org/apache/servicemix/wsn/subscribe-raw.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml Tue Feb 21 15:40:05 2006
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
-<wsnt:CreatePullPoint xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:sm="http://servicemix.apache.org/wsn2005/1.0">
- <sm:address>
- http://www.consumer.org/service/endpoint
- </sm:address>
+<?xml version="1.0"?>
+<wsnt:CreatePullPoint xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:sm="http://servicemix.apache.org/wsn2005/1.0">
+ <sm:address>
+ http://www.consumer.org/service/endpoint
+ </sm:address>
</wsnt:CreatePullPoint>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/pullpoint.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml Tue Feb 21 15:40:05 2006
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org">
- <wsnt:ConsumerReference>
- <wsa:Address>
- http://www.consumer.org/service/endpoint
- </wsa:Address>
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
- myTopic
- </wsnt:TopicExpression>
- </wsnt:Filter>
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org">
+ <wsnt:ConsumerReference>
+ <wsa:Address>
+ http://www.consumer.org/service/endpoint
+ </wsa:Address>
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
+ myTopic
+ </wsnt:TopicExpression>
+ </wsnt:Filter>
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/pullpoint/subscribe.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml Tue Feb 21 15:40:05 2006
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
-<wsnt:Subscribe
- xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:ncex="http://www.consumer.org"
- xmlns:npex="http://www.producer.org">
- <wsnt:ConsumerReference>
- <wsa:Address>
- http://www.consumer.org/service/endpoint
- </wsa:Address>
- </wsnt:ConsumerReference>
- <wsnt:Filter>
- <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
- myTopic
- </wsnt:TopicExpression>
- </wsnt:Filter>
+<?xml version="1.0"?>
+<wsnt:Subscribe
+ xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:ncex="http://www.consumer.org"
+ xmlns:npex="http://www.producer.org">
+ <wsnt:ConsumerReference>
+ <wsa:Address>
+ http://www.consumer.org/service/endpoint
+ </wsa:Address>
+ </wsnt:ConsumerReference>
+ <wsnt:Filter>
+ <wsnt:TopicExpression Dialect="http://docs.oasis-open.org/wsn/t-1/TopicExpression/Simple">
+ myTopic
+ </wsnt:TopicExpression>
+ </wsnt:Filter>
</wsnt:Subscribe>
Propchange: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/subscription/subscribe.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/plugin.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/plugin.properties (original)
+++ incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/plugin.properties Tue Feb 21 15:40:05 2006
@@ -1,5 +1,5 @@
-# ---------------------------------------------------------------------------
-# Some default properties
-# ---------------------------------------------------------------------------
-eclipseplugin.output.dir=${maven.build.dir}/plugins
-eclipseplugin.template=${plugin.resources}/plugin.jsl
+# ---------------------------------------------------------------------------
+# Some default properties
+# ---------------------------------------------------------------------------
+eclipseplugin.output.dir=${maven.build.dir}/plugins
+eclipseplugin.template=${plugin.resources}/plugin.jsl
Propchange: incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/plugin.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml Tue Feb 21 15:40:05 2006
@@ -1,42 +1,42 @@
-<project>
- <pomVersion>3</pomVersion>
- <artifactId>maven-eclipse-plugin-plugin</artifactId>
- <groupId>servicemix</groupId>
- <name>Eclipse Plugin Generating Plugin</name>
- <currentVersion>0.1</currentVersion>
- <inceptionYear>2005</inceptionYear>
-
- <shortDescription>
- Plugin that generates an Eclipse plugin
- </shortDescription>
- <description>
- Plugin that generates an Eclipse plugin
- </description>
-
- <developers>
- <developer>
- <name>Philip Dodds</name>
- <id>pdodds</id>
- <email>philip.dodds@gmail.com</email>
- <timezone>0</timezone>
- </developer>
- </developers>
- <build>
- <!-- This section is compulsory -->
- <resources>
- <resource>
- <directory>${basedir}/src/plugin-resources</directory>
- <targetPath>plugin-resources</targetPath>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>plugin.jelly</include>
- <include>plugin.properties</include>
- <include>project.properties</include>
- <include>project.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
+<project>
+ <pomVersion>3</pomVersion>
+ <artifactId>maven-eclipse-plugin-plugin</artifactId>
+ <groupId>servicemix</groupId>
+ <name>Eclipse Plugin Generating Plugin</name>
+ <currentVersion>0.1</currentVersion>
+ <inceptionYear>2005</inceptionYear>
+
+ <shortDescription>
+ Plugin that generates an Eclipse plugin
+ </shortDescription>
+ <description>
+ Plugin that generates an Eclipse plugin
+ </description>
+
+ <developers>
+ <developer>
+ <name>Philip Dodds</name>
+ <id>pdodds</id>
+ <email>philip.dodds@gmail.com</email>
+ <timezone>0</timezone>
+ </developer>
+ </developers>
+ <build>
+ <!-- This section is compulsory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/src/plugin-resources</directory>
+ <targetPath>plugin-resources</targetPath>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>plugin.jelly</include>
+ <include>plugin.properties</include>
+ <include>project.properties</include>
+ <include>project.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Propchange: incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/pom.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/pom.xml Tue Feb 21 15:40:05 2006
@@ -1,17 +1,17 @@
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0">
-
- <parent>
- <artifactId>maven-archetypes</artifactId>
- <groupId>org.apache.maven.archetypes</groupId>
- <version>1.0-alpha-3</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.servicemix.archetypes</groupId>
- <artifactId>maven-jbi-archetype</artifactId>
- <version>1.0</version>
- <name>Maven2 JBI Archetype</name>
- <description>Servicemix JBI Archetype for Maven2</description>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <parent>
+ <artifactId>maven-archetypes</artifactId>
+ <groupId>org.apache.maven.archetypes</groupId>
+ <version>1.0-alpha-3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.servicemix.archetypes</groupId>
+ <artifactId>maven-jbi-archetype</artifactId>
+ <version>1.0</version>
+ <name>Maven2 JBI Archetype</name>
+ <description>Servicemix JBI Archetype for Maven2</description>
</project>
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/DISCLAIMER.txt
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/DISCLAIMER.txt?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/DISCLAIMER.txt (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/DISCLAIMER.txt Tue Feb 21 15:40:05 2006
@@ -1,7 +1,7 @@
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
-accepted projects until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a manner
-consistent with other successful ASF projects. While incubation status is not
-necessarily a reflection of the completeness or stability of the code, it does
+ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does
indicate that the project has yet to be fully endorsed by the ASF.
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/DISCLAIMER.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/archetype.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/archetype.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/archetype.xml Tue Feb 21 15:40:05 2006
@@ -1,9 +1,9 @@
-<archetype>
- <id>maven-archetype-jbi</id>
- <resources>
- <resource>src/main/java/App.java</resource>
- <resource>src/test/java/AppTest.java</resource>
- <resource>src/main/merge/services.xml</resource>
- <resource>src/main/jbi/META-INF/jbi-spring.xml</resource>
- </resources>
-</archetype>
+<archetype>
+ <id>maven-archetype-jbi</id>
+ <resources>
+ <resource>src/main/java/App.java</resource>
+ <resource>src/test/java/AppTest.java</resource>
+ <resource>src/main/merge/services.xml</resource>
+ <resource>src/main/jbi/META-INF/jbi-spring.xml</resource>
+ </resources>
+</archetype>
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/META-INF/archetype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/pom.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/pom.xml Tue Feb 21 15:40:05 2006
@@ -1,48 +1,48 @@
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
- <name>Servicemix JBI Component</name>
- <dependencies>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxp</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jmx</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>servicemix-client</artifactId>
- <version>1.0</version>
- <!--properties>
- <jbi.bundle>true</jbi.bundle>
- </properties-->
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <name>Servicemix JBI Component</name>
+ <dependencies>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxp</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>servicemix-client</artifactId>
+ <version>1.0</version>
+ <!--properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties-->
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/java/App.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/java/App.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/java/App.java (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/java/App.java Tue Feb 21 15:40:05 2006
@@ -1,13 +1,13 @@
-package $package;
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
+package $package;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/java/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/DISCLAIMER.txt
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/DISCLAIMER.txt?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/DISCLAIMER.txt (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/DISCLAIMER.txt Tue Feb 21 15:40:05 2006
@@ -1,7 +1,7 @@
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
-accepted projects until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a manner
-consistent with other successful ASF projects. While incubation status is not
-necessarily a reflection of the completeness or stability of the code, it does
+ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does
indicate that the project has yet to be fully endorsed by the ASF.
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/DISCLAIMER.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/jbi-spring.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/jbi-spring.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/jbi-spring.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/jbi-spring.xml Tue Feb 21 15:40:05 2006
@@ -1,8 +1,8 @@
-<beans>
- <!-- This is going to be where we declare the beans that we want the
- SpringComponent container to build -->
-
- <!-- <bean id="myLoggerExample"
- class="org.servicemix.demo.LoggerInterface">
- </bean> -->
+<beans>
+ <!-- This is going to be where we declare the beans that we want the
+ SpringComponent container to build -->
+
+ <!-- <bean id="myLoggerExample"
+ class="org.servicemix.demo.LoggerInterface">
+ </bean> -->
</beans>
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/jbi/META-INF/jbi-spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/merge/services.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/merge/services.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/merge/services.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/merge/services.xml Tue Feb 21 15:40:05 2006
@@ -1,12 +1,12 @@
-<!-- This is where we are able to declare the ins and outs of the Service
- as consumes and provides elements, the service-names and endpoints
- will be used to activate the JBI endpoints, and we can use the
- interface-name to determine which one we want to call and also which
- bean is going to receive the actual JBI exchange -->
-<!--
-<services binding-component="false"
- xmlns:logger="http://tempuri.org/logger.wsdl">
- <provides interface-name="logger:log"
- service-name="logger:example"/>
-</services>
+<!-- This is where we are able to declare the ins and outs of the Service
+ as consumes and provides elements, the service-names and endpoints
+ will be used to activate the JBI endpoints, and we can use the
+ interface-name to determine which one we want to call and also which
+ bean is going to receive the actual JBI exchange -->
+<!--
+<services binding-component="false"
+ xmlns:logger="http://tempuri.org/logger.wsdl">
+ <provides interface-name="logger:log"
+ service-name="logger:example"/>
+</services>
->
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/main/merge/services.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java Tue Feb 21 15:40:05 2006
@@ -1,38 +1,38 @@
-package $package;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
+package $package;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: incubator/servicemix/trunk/tooling/maven-jbi-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/pom.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/pom.xml Tue Feb 21 15:40:05 2006
@@ -1,45 +1,45 @@
-<project>
-
- <parent>
- <groupId>incubator-servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.servicemix.plugins</groupId>
- <artifactId>maven2-eclipse-plugin-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>ServiceMix :: Maven2 Eclipse Plugin Plugin</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/</url>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0.5</version>
- </dependency>
- </dependencies>
-</project>
+<project>
+
+ <parent>
+ <groupId>incubator-servicemix</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.servicemix.plugins</groupId>
+ <artifactId>maven2-eclipse-plugin-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>ServiceMix :: Maven2 Eclipse Plugin Plugin</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/com/unity/maven2/plugin/EclipsePluginMojo.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/com/unity/maven2/plugin/EclipsePluginMojo.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/com/unity/maven2/plugin/EclipsePluginMojo.java (original)
+++ incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/com/unity/maven2/plugin/EclipsePluginMojo.java Tue Feb 21 15:40:05 2006
@@ -1,196 +1,196 @@
-package com.unity.maven2.plugin;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.FileUtils;
-
-/**
- * Basic Mojo that will leverage the project descriptor to generate an eclipse
- * manifest
- *
- * @goal create-manifest
- * @description generates the manifest
- * @phase generate-resources
- * @requiresDependencyResolution runtime
- */
-public class EclipsePluginMojo extends AbstractMojo {
-
- /**
- * The package name
- *
- * @parameter
- * @required
- */
- private String packageName;
-
- /**
- * The plugin class
- *
- * @parameter
- * @required
- */
- private String pluginClass;
-
- private static final String LIB_DIRECTORY = "";
-
- /**
- * Directory where the plugin.xml file will be auto-generated.
- *
- * @parameter expression="${project.build.directory}"
- */
- private String projectBuildDirectory;
-
- /**
- * The maven project.
- *
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- protected MavenProject project;
-
- public void execute() throws MojoExecutionException, MojoFailureException {
- getLog().info("Constructing a MANIFEST.MF for Eclipse 3.0");
-
- try {
-
- File metaInfDir = new File(project.getBasedir().getAbsolutePath()
- + "/META-INF");
- metaInfDir.mkdirs();
- FileWriter fileWriter = new FileWriter(new File(metaInfDir
- .getAbsolutePath()
- + "/MANIFEST.MF"));
-
- BufferedWriter writer = new BufferedWriter(fileWriter);
-
- writer.write("Manifest-Version: 1.0\nBundle-ManifestVersion: 2");
- writer.write("\nBundle-Name: ");
- writer.write(project.getName());
- writer.write("\nBundle-SymbolicName: ");
- writer.write(packageName);
- writer.write("; singleton:=true");
- writer.write("\nBundle-Version: ");
- writer.write(project.getVersion().replaceAll("-SNAPSHOT", ""));
- writer.write("\nBundle-ClassPath:");
- for (Iterator it = getEmbeddedDependencies().iterator(); it
- .hasNext();) {
- writer.write(" ");
- writer.write(it.next().toString());
- if (it.hasNext())
- writer.write(",\n");
- }
-
- writer.write("\nBundle-Activator: ");
- writer.write(pluginClass);
- writer.write("\nBundle-Vendor: ");
- writer.write(project.getOrganization().getName());
- writer.write("\nBundle-Localization: plugin");
- writer.write("\nExport-Package: .");
- writer.write("\nRequire-Bundle:");
-
- for (Iterator it = getEclipseDependencies().iterator(); it
- .hasNext();) {
- writer.write(" ");
- writer.write(it.next().toString());
- writer.write(";visibility:=reexport");
- if (it.hasNext())
- writer.write(",\n");
- }
-
- writer.write("\nEclipse-AutoStart: true\n");
- writer.close();
- fileWriter.close();
-
- FileWriter buildPropertiesFileWriter = new FileWriter(new File(
- project.getBasedir().getAbsolutePath()
- + "/build.properties"));
-
- BufferedWriter buildPropertiesWriter = new BufferedWriter(
- buildPropertiesFileWriter);
-
- buildPropertiesWriter.write("bin.includes = /META-INF");
-
- buildPropertiesWriter.close();
-
- buildPropertiesFileWriter.close();
-
- } catch (Exception e) {
- throw new MojoFailureException(
- "Unable to generate Eclipse 3.0 manifest, "
- + e.getMessage());
- }
-
- }
-
- public List getEmbeddedDependencies() {
- List uris = new ArrayList();
- Set artifacts = project.getArtifacts();
-
- File destinationDir = new File(projectBuildDirectory);
- for (Iterator iter = artifacts.iterator(); iter.hasNext();) {
- Artifact artifact = (Artifact) iter.next();
-
- // TODO: utilise appropriate methods from project builder
- ScopeArtifactFilter filter = new ScopeArtifactFilter(
- Artifact.SCOPE_RUNTIME);
-
- if (!artifact.getGroupId().equals("eclipse")) {
- try {
- FileUtils.copyFileToDirectory(artifact.getFile(),
- destinationDir);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- if (!artifact.isOptional() && filter.include(artifact)) {
- String type = artifact.getType();
- if ("jar".equals(type)) {
- uris.add("target/" + artifact.getFile().getName());
- }
- }
- }
- }
-
- return uris;
- }
-
- public List getEclipseDependencies() {
- List uris = new ArrayList();
- Set artifacts = project.getArtifacts();
-
- File destinationDir = new File(projectBuildDirectory);
- for (Iterator iter = artifacts.iterator(); iter.hasNext();) {
- Artifact artifact = (Artifact) iter.next();
-
- // TODO: utilise appropriate methods from project builder
- ScopeArtifactFilter filter = new ScopeArtifactFilter(
- Artifact.SCOPE_RUNTIME);
-
- if (artifact.getGroupId().equals("eclipse")) {
-
- if (!artifact.isOptional() && filter.include(artifact)) {
- String type = artifact.getType();
- if ("jar".equals(type)) {
- uris.add(artifact.getArtifactId());
- }
- }
- }
-
- }
-
- return uris;
- }
-}
+package com.unity.maven2.plugin;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.FileUtils;
+
+/**
+ * Basic Mojo that will leverage the project descriptor to generate an eclipse
+ * manifest
+ *
+ * @goal create-manifest
+ * @description generates the manifest
+ * @phase generate-resources
+ * @requiresDependencyResolution runtime
+ */
+public class EclipsePluginMojo extends AbstractMojo {
+
+ /**
+ * The package name
+ *
+ * @parameter
+ * @required
+ */
+ private String packageName;
+
+ /**
+ * The plugin class
+ *
+ * @parameter
+ * @required
+ */
+ private String pluginClass;
+
+ private static final String LIB_DIRECTORY = "";
+
+ /**
+ * Directory where the plugin.xml file will be auto-generated.
+ *
+ * @parameter expression="${project.build.directory}"
+ */
+ private String projectBuildDirectory;
+
+ /**
+ * The maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ protected MavenProject project;
+
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ getLog().info("Constructing a MANIFEST.MF for Eclipse 3.0");
+
+ try {
+
+ File metaInfDir = new File(project.getBasedir().getAbsolutePath()
+ + "/META-INF");
+ metaInfDir.mkdirs();
+ FileWriter fileWriter = new FileWriter(new File(metaInfDir
+ .getAbsolutePath()
+ + "/MANIFEST.MF"));
+
+ BufferedWriter writer = new BufferedWriter(fileWriter);
+
+ writer.write("Manifest-Version: 1.0\nBundle-ManifestVersion: 2");
+ writer.write("\nBundle-Name: ");
+ writer.write(project.getName());
+ writer.write("\nBundle-SymbolicName: ");
+ writer.write(packageName);
+ writer.write("; singleton:=true");
+ writer.write("\nBundle-Version: ");
+ writer.write(project.getVersion().replaceAll("-SNAPSHOT", ""));
+ writer.write("\nBundle-ClassPath:");
+ for (Iterator it = getEmbeddedDependencies().iterator(); it
+ .hasNext();) {
+ writer.write(" ");
+ writer.write(it.next().toString());
+ if (it.hasNext())
+ writer.write(",\n");
+ }
+
+ writer.write("\nBundle-Activator: ");
+ writer.write(pluginClass);
+ writer.write("\nBundle-Vendor: ");
+ writer.write(project.getOrganization().getName());
+ writer.write("\nBundle-Localization: plugin");
+ writer.write("\nExport-Package: .");
+ writer.write("\nRequire-Bundle:");
+
+ for (Iterator it = getEclipseDependencies().iterator(); it
+ .hasNext();) {
+ writer.write(" ");
+ writer.write(it.next().toString());
+ writer.write(";visibility:=reexport");
+ if (it.hasNext())
+ writer.write(",\n");
+ }
+
+ writer.write("\nEclipse-AutoStart: true\n");
+ writer.close();
+ fileWriter.close();
+
+ FileWriter buildPropertiesFileWriter = new FileWriter(new File(
+ project.getBasedir().getAbsolutePath()
+ + "/build.properties"));
+
+ BufferedWriter buildPropertiesWriter = new BufferedWriter(
+ buildPropertiesFileWriter);
+
+ buildPropertiesWriter.write("bin.includes = /META-INF");
+
+ buildPropertiesWriter.close();
+
+ buildPropertiesFileWriter.close();
+
+ } catch (Exception e) {
+ throw new MojoFailureException(
+ "Unable to generate Eclipse 3.0 manifest, "
+ + e.getMessage());
+ }
+
+ }
+
+ public List getEmbeddedDependencies() {
+ List uris = new ArrayList();
+ Set artifacts = project.getArtifacts();
+
+ File destinationDir = new File(projectBuildDirectory);
+ for (Iterator iter = artifacts.iterator(); iter.hasNext();) {
+ Artifact artifact = (Artifact) iter.next();
+
+ // TODO: utilise appropriate methods from project builder
+ ScopeArtifactFilter filter = new ScopeArtifactFilter(
+ Artifact.SCOPE_RUNTIME);
+
+ if (!artifact.getGroupId().equals("eclipse")) {
+ try {
+ FileUtils.copyFileToDirectory(artifact.getFile(),
+ destinationDir);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ if (!artifact.isOptional() && filter.include(artifact)) {
+ String type = artifact.getType();
+ if ("jar".equals(type)) {
+ uris.add("target/" + artifact.getFile().getName());
+ }
+ }
+ }
+ }
+
+ return uris;
+ }
+
+ public List getEclipseDependencies() {
+ List uris = new ArrayList();
+ Set artifacts = project.getArtifacts();
+
+ File destinationDir = new File(projectBuildDirectory);
+ for (Iterator iter = artifacts.iterator(); iter.hasNext();) {
+ Artifact artifact = (Artifact) iter.next();
+
+ // TODO: utilise appropriate methods from project builder
+ ScopeArtifactFilter filter = new ScopeArtifactFilter(
+ Artifact.SCOPE_RUNTIME);
+
+ if (artifact.getGroupId().equals("eclipse")) {
+
+ if (!artifact.isOptional() && filter.include(artifact)) {
+ String type = artifact.getType();
+ if ("jar".equals(type)) {
+ uris.add(artifact.getArtifactId());
+ }
+ }
+ }
+
+ }
+
+ return uris;
+ }
+}
Propchange: incubator/servicemix/trunk/tooling/maven2-eclipse-plugin-plugin/src/main/java/com/unity/maven2/plugin/EclipsePluginMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/pom.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-jbi-plugin/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/maven2-jbi-plugin/pom.xml Tue Feb 21 15:40:05 2006
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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.
--->
-<!-- $Rev: 365333 $ $Date: 2006-01-02 12:21:09 +0100 (lun., 02 janv. 2006) $ -->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0">
-
- <parent>
- <groupId>incubator-servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.servicemix.plugins</groupId>
- <artifactId>maven2-jbi-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>ServiceMix :: Maven2 JBI Plugin</name>
- <version>1.0-SNAPSHOT</version>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/servicemix/trunk/tooling/maven2-jbi-plugin</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/servicemix/trunk/tooling/maven2-jbi-plugin</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0.5</version>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed 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.
+-->
+<!-- $Rev: 365333 $ $Date: 2006-01-02 12:21:09 +0100 (lun., 02 janv. 2006) $ -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <parent>
+ <groupId>incubator-servicemix</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.servicemix.plugins</groupId>
+ <artifactId>maven2-jbi-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>ServiceMix :: Maven2 JBI Plugin</name>
+ <version>1.0-SNAPSHOT</version>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/servicemix/trunk/tooling/maven2-jbi-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/servicemix/trunk/tooling/maven2-jbi-plugin</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java (original)
+++ incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java Tue Feb 21 15:40:05 2006
@@ -1,70 +1,70 @@
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed 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.servicemix.maven.plugin.jbi;
-
-import java.io.File;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectHelper;
-
-public abstract class AbstractJbiMojo extends AbstractMojo {
-
- public static final String META_INF = "META-INF";
-
- public static final String JBI_DESCRIPTOR = "jbi.xml";
-
- public static final String LIB_DIRECTORY = "lib";
-
- /**
- * Maven ProjectHelper
- *
- * @component
- */
- protected MavenProjectHelper projectHelper;
-
- /**
- * The maven project.
- *
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- protected MavenProject project;
-
- /**
- * Directory that resources are copied to during the build.
- *
- * @parameter expression="${project.build.directory}/${project.artifactId}-${project.version}-installer"
- * @required
- */
- protected File workDirectory;
-
- protected MavenProject getProject()
- {
- return project;
- }
-
- protected File getWorkDirectory()
- {
- return workDirectory;
- }
-
- public MavenProjectHelper getProjectHelper() {
- return projectHelper;
- }
-
-}
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.servicemix.maven.plugin.jbi;
+
+import java.io.File;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+
+public abstract class AbstractJbiMojo extends AbstractMojo {
+
+ public static final String META_INF = "META-INF";
+
+ public static final String JBI_DESCRIPTOR = "jbi.xml";
+
+ public static final String LIB_DIRECTORY = "lib";
+
+ /**
+ * Maven ProjectHelper
+ *
+ * @component
+ */
+ protected MavenProjectHelper projectHelper;
+
+ /**
+ * The maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ protected MavenProject project;
+
+ /**
+ * Directory that resources are copied to during the build.
+ *
+ * @parameter expression="${project.build.directory}/${project.artifactId}-${project.version}-installer"
+ * @required
+ */
+ protected File workDirectory;
+
+ protected MavenProject getProject()
+ {
+ return project;
+ }
+
+ protected File getWorkDirectory()
+ {
+ return workDirectory;
+ }
+
+ public MavenProjectHelper getProjectHelper() {
+ return projectHelper;
+ }
+
+}
Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractJbiMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java (original)
+++ incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java Tue Feb 21 15:40:05 2006
@@ -1,181 +1,181 @@
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed 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.servicemix.maven.plugin.jbi;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.util.FileUtils;
-
-/**
- * A Mojo used to build the jbi.xml file.
- *
- * @author <a href="gnodet@apache.org">Guillaume Nodet</a>
- * @version $Id: GenerateComponentDescriptorMojo 314956 2005-10-12 16:27:15Z brett $
- * @goal generate-jbi-descriptor
- * @phase generate-resources
- * @requiresDependencyResolution runtime
- * @description generates the jbi.xml deployment descriptor
- */
-public class GenerateComponentDescriptorMojo extends AbstractJbiMojo {
-
- public static final String UTF_8 = "UTF-8";
-
- /**
- * Whether the application.xml should be generated or not.
- *
- * @parameter
- */
- private Boolean generateJbiDescriptor = Boolean.TRUE;
-
- /**
- * The component class name.
- *
- * @parameter
- * @required
- */
- private String component;
-
- /**
- * The bootstrap class name.
- *
- * @parameter
- * @required
- */
- private String bootstrap;
-
- /**
- * The component type.
- *
- * @parameter
- * @required
- */
- private String type;
-
- /**
- * The component name.
- *
- * @parameter expression="${project.artifactId}"
- */
- private String name;
-
- /**
- * The component description.
- *
- * @parameter expression="${project.name}"
- */
- private String description;
-
- /**
- * Character encoding for the auto-generated application.xml file.
- *
- * @parameter
- */
- private String encoding = UTF_8;
-
- /**
- * Directory where the application.xml file will be auto-generated.
- *
- * @parameter expression="${project.build.directory}"
- */
- private String generatedDescriptorLocation;
-
- public void execute() throws MojoExecutionException, MojoFailureException {
-
- getLog().debug( " ======= GenerateComponentDescriptorMojo settings =======" );
- getLog().debug( "workDirectory[" + workDirectory + "]" );
- getLog().debug( "generateJbiDescriptor[" + generateJbiDescriptor + "]" );
- getLog().debug( "type[" + type + "]" );
- getLog().debug( "component[" + component + "]" );
- getLog().debug( "bootstrap[" + bootstrap + "]" );
- getLog().debug( "name[" + name + "]" );
- getLog().debug( "description[" + description + "]" );
- getLog().debug( "encoding[" + encoding + "]" );
- getLog().debug( "generatedDescriptorLocation[" + generatedDescriptorLocation + "]" );
-
- if ( !generateJbiDescriptor.booleanValue() )
- {
- getLog().debug( "Generation of jbi.xml is disabled" );
- return;
- }
-
- // Generate jbi descriptor and copy it to the build directory
- getLog().info( "Generating jbi.xml" );
- try
- {
- generateJbiDescriptor();
- }
- catch ( JbiPluginException e )
- {
- throw new MojoExecutionException( "Failed to generate jbi.xml", e );
- }
-
- try
- {
- FileUtils.copyFileToDirectory( new File( generatedDescriptorLocation, JBI_DESCRIPTOR ),
- new File( getWorkDirectory(), META_INF ) );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Unable to copy jbi.xml to final destination", e );
- }
- }
-
- /**
- * Generates the deployment descriptor if necessary.
- */
- protected void generateJbiDescriptor() throws JbiPluginException
- {
- File outputDir = new File( generatedDescriptorLocation );
- if ( !outputDir.exists() )
- {
- outputDir.mkdirs();
- }
-
- File descriptor = new File( outputDir, JBI_DESCRIPTOR );
-
- List uris = new ArrayList();
- uris.add(project.getArtifactId() + "-" + project.getVersion() + ".jar");
-
- Set artifacts = project.getArtifacts();
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
- {
- Artifact artifact = (Artifact) iter.next();
-
- // TODO: utilise appropriate methods from project builder
- ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
- if ( !artifact.isOptional() && filter.include( artifact ) )
- {
- String type = artifact.getType();
- if ( "jar".equals( type ) )
- {
- uris.add(LIB_DIRECTORY + "/" + artifact.getFile().getName());
- }
- }
- }
-
- JbiComponentDescriptorWriter writer = new JbiComponentDescriptorWriter( encoding );
- writer.write(descriptor, component, bootstrap, type, name, description, uris);
- }
-}
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.servicemix.maven.plugin.jbi;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.codehaus.plexus.util.FileUtils;
+
+/**
+ * A Mojo used to build the jbi.xml file.
+ *
+ * @author <a href="gnodet@apache.org">Guillaume Nodet</a>
+ * @version $Id: GenerateComponentDescriptorMojo 314956 2005-10-12 16:27:15Z brett $
+ * @goal generate-jbi-descriptor
+ * @phase generate-resources
+ * @requiresDependencyResolution runtime
+ * @description generates the jbi.xml deployment descriptor
+ */
+public class GenerateComponentDescriptorMojo extends AbstractJbiMojo {
+
+ public static final String UTF_8 = "UTF-8";
+
+ /**
+ * Whether the application.xml should be generated or not.
+ *
+ * @parameter
+ */
+ private Boolean generateJbiDescriptor = Boolean.TRUE;
+
+ /**
+ * The component class name.
+ *
+ * @parameter
+ * @required
+ */
+ private String component;
+
+ /**
+ * The bootstrap class name.
+ *
+ * @parameter
+ * @required
+ */
+ private String bootstrap;
+
+ /**
+ * The component type.
+ *
+ * @parameter
+ * @required
+ */
+ private String type;
+
+ /**
+ * The component name.
+ *
+ * @parameter expression="${project.artifactId}"
+ */
+ private String name;
+
+ /**
+ * The component description.
+ *
+ * @parameter expression="${project.name}"
+ */
+ private String description;
+
+ /**
+ * Character encoding for the auto-generated application.xml file.
+ *
+ * @parameter
+ */
+ private String encoding = UTF_8;
+
+ /**
+ * Directory where the application.xml file will be auto-generated.
+ *
+ * @parameter expression="${project.build.directory}"
+ */
+ private String generatedDescriptorLocation;
+
+ public void execute() throws MojoExecutionException, MojoFailureException {
+
+ getLog().debug( " ======= GenerateComponentDescriptorMojo settings =======" );
+ getLog().debug( "workDirectory[" + workDirectory + "]" );
+ getLog().debug( "generateJbiDescriptor[" + generateJbiDescriptor + "]" );
+ getLog().debug( "type[" + type + "]" );
+ getLog().debug( "component[" + component + "]" );
+ getLog().debug( "bootstrap[" + bootstrap + "]" );
+ getLog().debug( "name[" + name + "]" );
+ getLog().debug( "description[" + description + "]" );
+ getLog().debug( "encoding[" + encoding + "]" );
+ getLog().debug( "generatedDescriptorLocation[" + generatedDescriptorLocation + "]" );
+
+ if ( !generateJbiDescriptor.booleanValue() )
+ {
+ getLog().debug( "Generation of jbi.xml is disabled" );
+ return;
+ }
+
+ // Generate jbi descriptor and copy it to the build directory
+ getLog().info( "Generating jbi.xml" );
+ try
+ {
+ generateJbiDescriptor();
+ }
+ catch ( JbiPluginException e )
+ {
+ throw new MojoExecutionException( "Failed to generate jbi.xml", e );
+ }
+
+ try
+ {
+ FileUtils.copyFileToDirectory( new File( generatedDescriptorLocation, JBI_DESCRIPTOR ),
+ new File( getWorkDirectory(), META_INF ) );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "Unable to copy jbi.xml to final destination", e );
+ }
+ }
+
+ /**
+ * Generates the deployment descriptor if necessary.
+ */
+ protected void generateJbiDescriptor() throws JbiPluginException
+ {
+ File outputDir = new File( generatedDescriptorLocation );
+ if ( !outputDir.exists() )
+ {
+ outputDir.mkdirs();
+ }
+
+ File descriptor = new File( outputDir, JBI_DESCRIPTOR );
+
+ List uris = new ArrayList();
+ uris.add(project.getArtifactId() + "-" + project.getVersion() + ".jar");
+
+ Set artifacts = project.getArtifacts();
+ for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+ {
+ Artifact artifact = (Artifact) iter.next();
+
+ // TODO: utilise appropriate methods from project builder
+ ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
+ if ( !artifact.isOptional() && filter.include( artifact ) )
+ {
+ String type = artifact.getType();
+ if ( "jar".equals( type ) )
+ {
+ uris.add(LIB_DIRECTORY + "/" + artifact.getFile().getName());
+ }
+ }
+ }
+
+ JbiComponentDescriptorWriter writer = new JbiComponentDescriptorWriter( encoding );
+ writer.write(descriptor, component, bootstrap, type, name, description, uris);
+ }
+}
Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
------------------------------------------------------------------------------
svn:eol-style = native