You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/10/13 12:26:03 UTC

svn commit: r704007 - in /servicemix/smx3/trunk: ./ distributions/apache-servicemix/ distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/ distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/

Author: ffang
Date: Mon Oct 13 03:26:01 2008
New Revision: 704007

URL: http://svn.apache.org/viewvc?rev=704007&view=rev
Log:
[SM-1628]ws-notification example doesn't work

Modified:
    servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
    servicemix/smx3/trunk/pom.xml

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=704007&r1=704006&r2=704007&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Mon Oct 13 03:26:01 2008
@@ -316,6 +316,16 @@
       <artifactId>backport-util-concurrent</artifactId>
       <version>2.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+      <version>1.1.2</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -664,10 +674,13 @@
 		  <outputDirectory>${basedir}/target/filtered</outputDirectory>
 		  <filters>
 		    <servicemix-version>${servicemix-version}</servicemix-version>
+                    <servicemix-common-version>${servicemix-common-version}</servicemix-common-version>
+                    <servicemix-wsn2005-version>${servicemix-common-version}</servicemix-wsn2005-version>
 		    <releases-repo-url>${releases-repo-url}</releases-repo-url>
                     <jaxb.version>${jaxb.version}</jaxb.version>
                     <jaxb.impl.version>${jaxb.impl.version}</jaxb.impl.version>
-                    <xfire-jsr181-api-version>${xfire-jsr181-api-version}</xfire-jsr181-api-version>
+                    <ws.metadata.version>1.1.2</ws.metadata.version>
+                    <jaxws.version>1.0</jaxws.version>
 		  </filters>
 		</configuration>
 		<executions>

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml?rev=704007&r1=704006&r2=704007&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml Mon Oct 13 03:26:01 2008
@@ -25,11 +25,12 @@
 
   <!-- We need to include the WS-Notification component dependencies in the classpath -->
   <classpath>
-    <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
-    <location>../lib/servicemix-common-@{servicemix-version}.jar</location>
+    <location>../lib/servicemix-wsn2005-@{servicemix-wsn2005-version}.jar</location>
+    <location>../lib/servicemix-common-@{servicemix-common-version}.jar</location>
     <location>../lib/jaxb-api-@{jaxb.version}.jar</location>
     <location>../lib/jaxb-impl-@{jaxb.impl.version}.jar</location>
-    <location>../lib/xfire-jsr181-api-@{xfire-jsr181-api-version}.jar</location>
+    <location>../lib/geronimo-ws-metadata_2.0_spec-@{ws.metadata.version}.jar</location>
+    <location>../lib/geronimo-jaxws_2.1_spec-@{jaxws.version}.jar</location>
   </classpath>
   <bean id="jndi" class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
         factory-method="makeInitialContext" singleton="true" />  
@@ -48,6 +49,15 @@
     </sm:flows>
 
     <sm:activationSpecs>
+      
+      <!-- The trace component will receive notifications from the above subscription
+           and display the message on the console -->
+      <sm:activationSpec componentName="trace" service="my:trace" endpoint="endpoint">
+        <sm:component>
+          <bean  class="org.apache.servicemix.components.util.TraceComponent" />
+        </sm:component>
+      </sm:activationSpec>
+
 
       <!-- WS-Notification component -->
       <sm:activationSpec componentName="servicemix-wsn2005">
@@ -74,13 +84,6 @@
         </sm:component>
       </sm:activationSpec>
 
-      <!-- The trace component will receive notifications from the above subscription
-           and display the message on the console -->
-      <sm:activationSpec componentName="trace" service="my:trace" endpoint="endpoint">
-        <sm:component>
-          <bean  class="org.apache.servicemix.components.util.TraceComponent" />
-        </sm:component>
-      </sm:activationSpec>
 
     </sm:activationSpecs>
   </sm:container>

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml?rev=704007&r1=704006&r2=704007&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml Mon Oct 13 03:26:01 2008
@@ -27,11 +27,12 @@
         factory-method="makeInitialContext" singleton="true" />
   <!-- We need to include the WS-Notification component dependencies in the classpath -->
   <classpath>
-    <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
-    <location>../lib/servicemix-common-@{servicemix-version}.jar</location>
+    <location>../lib/servicemix-wsn2005-@{servicemix-wsn2005-version}.jar</location>
+    <location>../lib/servicemix-common-@{servicemix-common-version}.jar</location>
     <location>../lib/jaxb-api-@{jaxb.version}.jar</location>
     <location>../lib/jaxb-impl-@{jaxb.impl.version}.jar</location>
-    <location>../lib/xfire-jsr181-api-@{xfire-jsr181-api-version}.jar</location>
+    <location>../lib/geronimo-ws-metadata_2.0_spec-@{ws.metadata.version}.jar</location>
+    <location>../lib/geronimo-jaxws_2.1_spec-@{jaxws.version}.jar</location>
   </classpath>
 
   <!-- the JBI container -->

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=704007&r1=704006&r2=704007&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Mon Oct 13 03:26:01 2008
@@ -51,6 +51,7 @@
     <properties>
         <servicemix-utils-version>1.0.0</servicemix-utils-version>
         <servicemix-specs-version>1.1.0</servicemix-specs-version>
+        <servicemix-common-version>2008.01-SNAPSHOT</servicemix-common-version>
         <servicemix-shared-version>2008.01-SNAPSHOT</servicemix-shared-version>
         <servicemix-quartz-version>2008.01-SNAPSHOT</servicemix-quartz-version>  
         <servicemix-jms-version>2008.01-SNAPSHOT</servicemix-jms-version>