Author: ruwan
Date: Tue Feb 17 00:06:43 2009
New Revision: 30966
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=30966

Log:
merging back from branch to trunk

Modified:
   trunk/esb/java/README.txt
   trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
   trunk/esb/java/modules/distribution/src/main/assembly/dist.xml

Modified: trunk/esb/java/README.txt
URL: 
http://wso2.org/svn/browse/wso2/trunk/esb/java/README.txt?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
--- trunk/esb/java/README.txt   (original)
+++ trunk/esb/java/README.txt   Tue Feb 17 00:06:43 2009
@@ -131,7 +131,7 @@
 
        - conf
          Contains configuration files
-    
+
     - database
         Contains the database 
 

Modified: trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
URL: 
http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/assembly/bin.xml?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml       
(original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml       Tue Feb 
17 00:06:43 2009
@@ -91,7 +91,7 @@
             <includes>
                 <include>org.apache.axis2:addressing:mar</include>
                 <include>org.apache.rampart:rampart:mar</include>
-                <include>org.apache.sandesha2:sandesha2:mar</include>          
      
+                <include>org.apache.sandesha2:sandesha2:mar</include>
             </includes>
             
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
@@ -165,6 +165,7 @@
             
<source>target/wso2carbon-${carbon.version}/bin/wso2server.bat</source>
             <outputDirectory>wso2esb-${esb.version}/bin/</outputDirectory>
             <filtered>true</filtered>
+            <fileMode>755</fileMode>
         </file>
         <file>
             
<source>target/wso2carbon-${carbon.version}/conf/carbon.xml</source>

Modified: trunk/esb/java/modules/distribution/src/main/assembly/dist.xml
URL: 
http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/assembly/dist.xml?rev=30966&r1=30965&r2=30966&view=diff
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/dist.xml      
(original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/dist.xml      Tue Feb 
17 00:06:43 2009
@@ -133,8 +133,6 @@
                 
<include>org.wso2.carbon:org.wso2.carbon.registry.ui.common:jar</include>
                 
<include>org.wso2.carbon:org.wso2.carbon.registry.ui.info:jar</include>
                 
<include>org.wso2.carbon:org.wso2.carbon.registry.mgt.ui.info:jar</include>
-                
<include>org.wso2.carbon:org.wso2.carbon.registry.ui.lifecycles:jar</include>
-                
<include>org.wso2.carbon:org.wso2.carbon.registry.mgt.ui.lifecycles:jar</include>
                 
<include>org.wso2.carbon:org.wso2.carbon.registry.ui.properties:jar</include>
                 
<include>org.wso2.carbon:org.wso2.carbon.registry.mgt.ui.properties:jar</include>
                 
<include>org.wso2.carbon:org.wso2.carbon.registry.ui.relations:jar</include>

_______________________________________________
Esb-java-dev mailing list
[email protected]
https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev

Reply via email to