cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r475114 - in /incubator/cxf/trunk/distribution: ./ src/main/assembly/ src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/etc/ src/main/release/samples/integration/JBI/external_provider_internal_consu...
Date Wed, 15 Nov 2006 04:20:09 GMT
Author: ffang
Date: Tue Nov 14 20:20:09 2006
New Revision: 475114

URL: http://svn.apache.org/viewvc?view=rev&rev=475114
Log:
[CXF-38] JBI Integration - add cxf-version property filter for jbi.xml to remove hard-coded
cxf version from it
                        

Added:
    incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml   (with props)
Removed:
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/etc/jbi.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc/jbi.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/etc/jbi.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc/jbi.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc/jbi.xml
Modified:
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=475114&r1=475113&r2=475114
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Tue Nov 14 20:20:09 2006
@@ -318,7 +318,33 @@
                                 <property name="output.cp" value="export CXF_CLASSPATH=${cp}"
/>
                                 <property name="output.ext" value="" />
                                 <echo file="${basedir}/target/srcbuild_env${output.ext}"
message="${output.cp}" />
-				 <echo file="${basedir}/target/version.properties" message="cxf.version=${pom.version}"/>
+       			        <echo file="${basedir}/target/version.properties" message="cxf.version=${pom.version}"/>
+                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc/jbi.xml"
overwrite="yes">
+                                            <filterset>
+                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
+                                            </filterset>
+                                </copy>
+                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc/jbi.xml"
overwrite="yes">
+                                            <filterset>
+                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
+                                            </filterset>
+                                </copy>
+                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc/jbi.xml"
overwrite="yes">
+                                            <filterset>
+                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
+                                            </filterset>
+                                </copy>
+                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/etc/jbi.xml"
overwrite="yes">
+                                            <filterset>
+                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
+                                            </filterset>
+                                </copy>
+                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/src/main/release/samples/integration/JBI/handlers/service-engine/etc/jbi.xml"
overwrite="yes">
+                                            <filterset>
+                                                <filter token="CXF_VERSION" value="${pom.version}"
/>
+                                            </filterset>
+                                </copy>
+
                             </tasks>
                         </configuration>
                         <goals>

Added: incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml?view=auto&rev=475114
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml (added)
+++ incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml Tue Nov 14 20:20:09 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */-->
+<jbi version="1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://java.sun.com/xml/ns/jbi"  xsi:schemaLocation="http://java.sun.com/xml/ns/jbi
./jbi.xsd">
+
+  <component type="service-engine"> 
+    <identification> 
+      <name>CXFServiceEngine</name> 
+      <description>This is a cxf service engine</description> 
+    </identification> 
+    <component-class-name description="description">org.apache.cxf.jbi.se.CXFServiceEngine</component-class-name>

+    <component-class-path> 
+      <path-element>cxf-integration-jbi-@CXF_VERSION@.jar</path-element> 
+      <path-element>cxf-incubator.jar</path-element>
+    </component-class-path> 
+    <bootstrap-class-name>org.apache.cxf.jbi.se.CXFBootstrap</bootstrap-class-name>

+    <bootstrap-class-path> 
+      <path-element>cxf-integration-jbi-@CXF_VERSION@.jar</path-element> 
+      <path-element>cxf-incubator.jar</path-element>
+    </bootstrap-class-path> 
+  </component> 
+</jbi>

Propchange: incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/assembly/jbi.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml?view=diff&rev=475114&r1=475113&r2=475114
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/build.xml
Tue Nov 14 20:20:09 2006
@@ -26,6 +26,7 @@
   <property name="wsdl.dir" location="./wsdl"/>
 
   <property file="../build.properties"/>
+  <property file="../../../../../etc/version.properties"/>
 
   <!-- reuse the macros defined in CXF samples -->
   <import file="${cxf.home}/samples/common_build.xml"/>        
@@ -35,7 +36,7 @@
     <pathelement location="${jbi.sdk.jar}"/>
     <fileset dir="${cxf.home}/lib">
       <include name="cxf-incubator.jar"/>
-      <include name="cxf-integration-jbi-2.0-incubator-M1-SNAPSHOT.jar"/>
+      <include name="cxf-integration-jbi-${cxf.version}.jar"/>
     </fileset>
   </path>
   



Mime
View raw message