Author: lresende
Date: Mon Dec  4 13:40:10 2006
New Revision: 482374

URL: http://svn.apache.org/viewvc?view=rev&rev=482374
Log:
TUSCANY-886

Modified:
    incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
    
incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml
    incubator/tuscany/java/das/pom.xml

Modified: 
incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml?view=diff&rev=482374&r1=482373&r2=482374
==============================================================================
--- incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml 
(original)
+++ incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml 
Mon Dec  4 13:40:10 2006
@@ -16,7 +16,8 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
---><assembly>
+-->
+<assembly>
     <id>bin</id>
     <includeBaseDirectory>false</includeBaseDirectory>
     <formats>
@@ -27,6 +28,7 @@
     <fileSets>
         <!-- include legal and other files -->
         <fileSet>
+            <outputDirectory>tuscany-das-${das.version}</outputDirectory>
             <includes>
                 <include>*.txt</include>
                 <include>*.htm</include>
@@ -37,12 +39,11 @@
 
     <dependencySets>
         <dependencySet>
-            <outputDirectory>lib</outputDirectory>
+            <outputDirectory>tuscany-das-${das.version}/lib</outputDirectory>
             <includes>
                 <include>org.apache.tuscany.das:tuscany-das-rdb</include>
             </includes>
             <fileMode>644</fileMode>
         </dependencySet>
     </dependencySets>
-</assembly>
-
+</assembly>
\ No newline at end of file

Modified: 
incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml?view=diff&rev=482374&r1=482373&r2=482374
==============================================================================
--- 
incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml
 (original)
+++ 
incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml
 Mon Dec  4 13:40:10 2006
@@ -28,6 +28,7 @@
     <fileSets>
         <!-- include legal and other files -->
         <fileSet>
+            
<outputDirectory>tuscany-das-samples-${das.version}</outputDirectory>
             <includes>
                 <include>*.txt</include>
                 <include>*.htm</include>
@@ -51,7 +52,7 @@
 
         <fileSet>
          <directory>../../samples/companyweb/dastest</directory>
-         <outputDirectory>databases/dastest</outputDirectory>
+         
<outputDirectory>tuscany-das-samples-${das.version}/databases/dastest</outputDirectory>
          <lineEnding>keep</lineEnding>
          <includes>
             <include>**/*.*</include>
@@ -65,7 +66,7 @@
     
     <dependencySets>
             <dependencySet>
-                <outputDirectory></outputDirectory>
+                
<outputDirectory>tuscany-das-samples-${das.version}</outputDirectory>
                 <includes>
                     
<include>org.apache.tuscany.das.samples:sample-companyweb</include>
                 </includes>

Modified: incubator/tuscany/java/das/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/das/pom.xml?view=diff&rev=482374&r1=482373&r2=482374
==============================================================================
--- incubator/tuscany/java/das/pom.xml (original)
+++ incubator/tuscany/java/das/pom.xml Mon Dec  4 13:40:10 2006
@@ -30,6 +30,10 @@
     <name>Tuscany DAS</name>
     <version>1.0-incubator-SNAPSHOT</version>
 
+    <properties>
+        <das.version>1.0-incubator-SNAPSHOT</das.version>
+    </properties>
+    
     <modules>
         <module>rdb</module>
         <module>samples</module>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to