cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r817470 - in /cxf/trunk/distribution: manifest/pom.xml pom.xml src/main/assembly/bin.xml src/main/release/samples/common_build.xml
Date Tue, 22 Sep 2009 01:35:40 GMT
Author: dkulp
Date: Tue Sep 22 01:35:39 2009
New Revision: 817470

URL: http://svn.apache.org/viewvc?rev=817470&view=rev
Log:
Move jars that are only there for samples into separate lib dir to
distinguish them from "runtime" things.

Modified:
    cxf/trunk/distribution/manifest/pom.xml
    cxf/trunk/distribution/pom.xml
    cxf/trunk/distribution/src/main/assembly/bin.xml
    cxf/trunk/distribution/src/main/release/samples/common_build.xml

Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=817470&r1=817469&r2=817470&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Tue Sep 22 01:35:39 2009
@@ -261,10 +261,6 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-        </dependency>    
 
         <dependency>
             <groupId>ant</groupId>

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=817470&r1=817469&r2=817470&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Tue Sep 22 01:35:39 2009
@@ -265,10 +265,6 @@
             <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
@@ -276,11 +272,6 @@
              <groupId>com.sun.xml.fastinfoset</groupId>
              <artifactId>FastInfoset</artifactId>
         </dependency>
-        <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <scope>compile</scope>
-        </dependency>
 
         <dependency>
             <groupId>ant</groupId>
@@ -329,27 +320,42 @@
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>${pom.groupId}</groupId>
                                     <artifactId>cxf-integration-jbi</artifactId>
                                     <version>${pom.version}</version>
+                                    <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>${pom.groupId}</groupId>
                                     <artifactId>cxf-integration-jca</artifactId>
                                     <version>${pom.version}</version>
+                                    <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>${pom.groupId}</groupId>
                                     <artifactId>cxf-rt-bindings-jbi</artifactId>
                                     <version>${pom.version}</version>
+                                    <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>${pom.groupId}</groupId>
                                     <artifactId>cxf-rt-transports-jbi</artifactId>
                                     <version>${pom.version}</version>
+                                    <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>junit</groupId>
+                                    <artifactId>junit</artifactId>
+                                    <version>4.4</version>
+                                    <outputDirectory>${project.build.directory}/sample-libs</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>commons-httpclient</groupId>
+                                    <artifactId>commons-httpclient</artifactId>
+                                    <version>3.1</version>
+                                    <outputDirectory>${project.build.directory}/sample-libs</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>

Modified: cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=817470&r1=817469&r2=817470&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ cxf/trunk/distribution/src/main/assembly/bin.xml Tue Sep 22 01:35:39 2009
@@ -97,6 +97,13 @@
             </excludes>
         </fileSet>
         <fileSet>
+            <directory>target/sample-libs</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/lib-samples</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
             <directory>manifest/target</directory>
             <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
             <includes>

Modified: cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/common_build.xml?rev=817470&r1=817469&r2=817470&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/common_build.xml Tue Sep 22 01:35:39 2009
@@ -96,6 +96,9 @@
         <pathelement location="${build.classes.dir}"/>
         <pathelement path="${srcbuild.classpath}"/>
         <pathelement location="${cxf.home}/lib/cxf-manifest.jar"/>
+        <fileset dir="${cxf.home}/lib-samples">
+            <include name="**/*.jar"/>
+        </fileset>
     </path>
     <condition property="thirdparty.classpath" value="">
         <not>



Mime
View raw message