You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/03/27 00:06:16 UTC

svn commit: r758915 - in /geronimo/server/trunk/plugins: cxf/cxf-tools/ cxf/cxf-tools/src/main/assembly/ cxf/cxf-tools/src/main/resources/bin/ cxf/cxf-tools/src/main/resources/contents/ cxf/cxf-tools/src/main/resources/contents/bin/ jaxws/jaxws-tools/ ...

Author: gawor
Date: Thu Mar 26 23:06:16 2009
New Revision: 758915

URL: http://svn.apache.org/viewvc?rev=758915&view=rev
Log:
move files into contents directory

Added:
    geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/contents/
    geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/contents/bin/
      - copied from r758884, geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/bin/
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/contents/
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/
      - copied from r758884, geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/bin/
Removed:
    geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/bin/
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/bin/
Modified:
    geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/assembly/bin.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml

Modified: geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml?rev=758915&r1=758914&r2=758915&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml Thu Mar 26 23:06:16 2009
@@ -82,7 +82,7 @@
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false"/>
-                            <copy-file relative-to="geronimo" dest-dir=""></copy-file>
+                            <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/assembly/bin.xml?rev=758915&r1=758914&r2=758915&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/assembly/bin.xml Thu Mar 26 23:06:16 2009
@@ -24,7 +24,7 @@
     <dependencySets>
 
         <dependencySet>
-            <outputDirectory>lib</outputDirectory>
+            <outputDirectory>contents/lib</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.modules:geronimo-cxf-tools</include>
@@ -32,7 +32,7 @@
         </dependencySet>
 
         <dependencySet>
-            <outputDirectory>bin</outputDirectory>
+            <outputDirectory>contents/bin</outputDirectory>
             <outputFileNameMapping>cxf-tools.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
@@ -46,7 +46,7 @@
         
         <fileSet>
             <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
+            <outputDirectory>contents/bin</outputDirectory>
             <includes>
                 <include>*</include>
             </includes>
@@ -62,7 +62,7 @@
         
         <fileSet>
             <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
+            <outputDirectory>contents/bin</outputDirectory>
             <includes>
                 <include>*.bat</include>
                 <include>*.cmd</include>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml?rev=758915&r1=758914&r2=758915&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml Thu Mar 26 23:06:16 2009
@@ -81,7 +81,7 @@
                     <category>Web Services</category>
                     <instance>
                         <plugin-artifact>
-                            <copy-file relative-to="geronimo" dest-dir=""></copy-file>
+                            <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml?rev=758915&r1=758914&r2=758915&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml Thu Mar 26 23:06:16 2009
@@ -24,7 +24,7 @@
     <dependencySets>
 
         <dependencySet>
-            <outputDirectory>lib</outputDirectory>
+            <outputDirectory>contents/lib</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
                 <include>org.apache.geronimo.modules:geronimo-jaxws-sun-tools</include>
@@ -32,7 +32,7 @@
         </dependencySet>
 
         <dependencySet>
-            <outputDirectory>bin</outputDirectory>
+            <outputDirectory>contents/bin</outputDirectory>
             <outputFileNameMapping>jaxws-tools.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
@@ -46,7 +46,7 @@
         
         <fileSet>
             <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
+            <outputDirectory>contents/bin</outputDirectory>
             <includes>
                 <include>*</include>
             </includes>
@@ -62,7 +62,7 @@
         
         <fileSet>
             <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
+            <outputDirectory>contents/bin</outputDirectory>
             <includes>
                 <include>*.bat</include>
                 <include>*.cmd</include>