You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ka...@apache.org on 2011/12/23 17:34:47 UTC

svn commit: r1222736 - in /synapse/branches/2.1: modules/distribution/src/main/assembly/bin.xml modules/war/pom.xml pom.xml

Author: kasun
Date: Fri Dec 23 16:34:46 2011
New Revision: 1222736

URL: http://svn.apache.org/viewvc?rev=1222736&view=rev
Log:
Fixing doc errors

Modified:
    synapse/branches/2.1/modules/distribution/src/main/assembly/bin.xml
    synapse/branches/2.1/modules/war/pom.xml
    synapse/branches/2.1/pom.xml

Modified: synapse/branches/2.1/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/synapse/branches/2.1/modules/distribution/src/main/assembly/bin.xml?rev=1222736&r1=1222735&r2=1222736&view=diff
==============================================================================
--- synapse/branches/2.1/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/branches/2.1/modules/distribution/src/main/assembly/bin.xml Fri Dec 23 16:34:46 2011
@@ -130,15 +130,7 @@
             <directory>src/main/bin/native</directory>
             <outputDirectory>synapse-${synapse.version}/bin/native</outputDirectory>
             <fileMode>755</fileMode>
-        </fileSet>      
-        <fileSet>
-            <directory>../../src/site/resources/images</directory>
-            <outputDirectory>synapse-${synapse.version}/docs/images</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../src/site/resources/logos</directory>
-            <outputDirectory>synapse-${synapse.version}/docs/logos</outputDirectory>
-        </fileSet>
+        </fileSet>             
         <fileSet>
             <directory>../../modules/samples/services</directory>
             <outputDirectory>synapse-${synapse.version}/samples/axis2Server/src</outputDirectory>
@@ -158,6 +150,10 @@
                 <exclude>**/*.sh</exclude>
             </excludes>
         </fileSet>
+ 	<fileSet>
+            <directory>../../target/site</directory>
+            <outputDirectory>synapse-${synapse.version}/docs</outputDirectory>            
+        </fileSet>
         <fileSet>
             <directory>../../modules/samples/src/main/scripts</directory>
             <outputDirectory>synapse-${synapse.version}/samples</outputDirectory>
@@ -189,32 +185,7 @@
         <!--</includes>-->
         <!--</fileSet>-->
     </fileSets>
-    <files>
-        <file>
-            <source>../../src/site/xdoc/Synapse_Configuration_Language.xml</source>
-            <outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
-            <destName>Synapse_Configuration_Language.html</destName>
-        </file>
-        <file>
-            <source>../../src/site/xdoc/Synapse_Samples.xml</source>
-            <outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
-            <destName>Synapse_Samples.html</destName>
-        </file>
-        <file>
-            <source>../../src/site/xdoc/Synapse_Samples_Setup.xml</source>
-            <outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
-            <destName>Synapse_Samples_Setup.html</destName>
-        </file>
-        <file>
-            <source>../../src/site/xdoc/Synapse_QuickStart.xml</source>
-            <outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
-            <destName>Synapse_QuickStart.html</destName>
-        </file>
-        <file>
-            <source>../../src/site/xdoc/Synapse_Extending.xml</source>
-            <outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
-            <destName>Synapse_Extending.html</destName>
-        </file>
+    <files>        
         <file>
             <source>.empty</source>
             <outputDirectory>synapse-${synapse.version}/work/temp/sampleClient</outputDirectory>

Modified: synapse/branches/2.1/modules/war/pom.xml
URL: http://svn.apache.org/viewvc/synapse/branches/2.1/modules/war/pom.xml?rev=1222736&r1=1222735&r2=1222736&view=diff
==============================================================================
--- synapse/branches/2.1/modules/war/pom.xml (original)
+++ synapse/branches/2.1/modules/war/pom.xml Fri Dec 23 16:34:46 2011
@@ -204,15 +204,8 @@
                             </includes>
                         </resource>
                         <resource>
-                            <directory>../../src/site/resources</directory>
-                            <targetPath>docs</targetPath>
-                            <includes>
-                                <include>Synapse_Configuration_Language.html</include>
-                                <include>Synapse_Samples.html</include>
-                                <include>Synapse_Samples_Setup.html</include>
-                                <include>Synapse_QuickStart.html</include>
-                                <include>Synapse_Extending.html</include>
-                            </includes>
+                            <directory>../../target/site</directory>
+                            <targetPath>docs</targetPath>                            
                         </resource>
                         <!--<resource>-->
                             <!--<directory>modules/samples/services</directory>-->

Modified: synapse/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/synapse/branches/2.1/pom.xml?rev=1222736&r1=1222735&r2=1222736&view=diff
==============================================================================
--- synapse/branches/2.1/pom.xml (original)
+++ synapse/branches/2.1/pom.xml Fri Dec 23 16:34:46 2011
@@ -235,6 +235,17 @@
                     </archive>
                 </configuration>
             </plugin>
+	     <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>2.1</version>
+                <inherited>false</inherited>
+                <executions>
+			<execution>
+				<phase>install</phase>			
+				<goals><goal>site</goal></goals>
+			</execution>
+                </executions>
+            </plugin>
 
         </plugins>
     </build>