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/03/24 11:51:27 UTC

svn commit: r640374 - 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 Mar 24 03:51:22 2008
New Revision: 640374

URL: http://svn.apache.org/viewvc?rev=640374&view=rev
Log:
[SM-1284]should avoid using hardcode lib version of ws-notification sample

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=640374&r1=640373&r2=640374&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Mon Mar 24 03:51:22 2008
@@ -632,6 +632,9 @@
 		  <filters>
 		    <servicemix-version>${servicemix-version}</servicemix-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>
 		  </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=640374&r1=640373&r2=640374&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 Mar 24 03:51:22 2008
@@ -27,9 +27,9 @@
   <classpath>
     <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
     <location>../lib/servicemix-common-@{servicemix-version}.jar</location>
-    <location>../lib/jaxb-api-2.0.jar</location>
-    <location>../lib/jaxb-impl-2.0.1.jar</location>
-    <location>../lib/xfire-jsr181-api-1.0-M1.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>
   </classpath>
   <bean id="jndi" class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
         factory-method="makeInitialContext" singleton="true" />  

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=640374&r1=640373&r2=640374&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 Mar 24 03:51:22 2008
@@ -29,9 +29,9 @@
   <classpath>
     <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
     <location>../lib/servicemix-common-@{servicemix-version}.jar</location>
-    <location>../lib/jaxb-api-2.0.jar</location>
-    <location>../lib/jaxb-impl-2.0.1.jar</location>
-    <location>../lib/xfire-jsr181-api-1.0-M1.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>
   </classpath>
 
   <!-- the JBI container -->

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=640374&r1=640373&r2=640374&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Mon Mar 24 03:51:22 2008
@@ -220,6 +220,8 @@
         <sitemesh-version>2.2.1</sitemesh-version>
         <woden-version>1.0.0M6</woden-version>
         <cxf-version>2.1-incubator-SNAPSHOT</cxf-version>
+        <jaxb.version>2.1</jaxb.version>
+        <jaxb.impl.version>2.1.4</jaxb.impl.version>
         <derby-version>10.2.2.0</derby-version>
 	    <saxon-version>8.9</saxon-version>
 
@@ -903,7 +905,7 @@
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.1.4</version>
+                <version>${jaxb.impl.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml</groupId>
@@ -922,7 +924,7 @@
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
-                <version>2.1</version>
+                <version>${jaxb.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml</groupId>