activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1130337 - in /activemq/activemq-apollo/trunk: apollo-scala/pom.xml apollo-website/pom.xml apollo-website/src/community/developers.page pom.xml
Date Wed, 01 Jun 2011 22:55:11 GMT
Author: chirino
Date: Wed Jun  1 22:55:11 2011
New Revision: 1130337

URL: http://svn.apache.org/viewvc?rev=1130337&view=rev
Log:
Generate scaladoc artifact for all modules.

Modified:
    activemq/activemq-apollo/trunk/apollo-scala/pom.xml
    activemq/activemq-apollo/trunk/apollo-website/pom.xml
    activemq/activemq-apollo/trunk/apollo-website/src/community/developers.page
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=1130337&r1=1130336&r2=1130337&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Wed Jun  1 22:55:11 2011
@@ -168,34 +168,6 @@
       </build>
     </profile>
 
-    <profile>
-      <id>apache-release</id>
-      <build>
-        <plugins>
-          
-          <!-- Generate the Scala Docs so that they can be included in the javadoc artifact
-->
-          <plugin>
-            <groupId>org.scala-tools</groupId>
-            <artifactId>maven-scala-plugin</artifactId>
-            <version>${maven-scala-plugin-version}</version>
-            <executions>
-              <execution>
-                <id>doc</id>
-                <phase>process-classes</phase>
-                <goals>
-                  <goal>doc</goal>
-                </goals>
-                <configuration>
-                  <reportOutputDirectory>${project.build.directory}</reportOutputDirectory>
-                  <outputDirectory>apidocs</outputDirectory>
-                </configuration>                
-              </execution>
-            </executions>
-          </plugin>
-
-        </plugins> 
-      </build>
-    </profile>
   </profiles>
   
 </project>

Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1130337&r1=1130336&r2=1130337&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Wed Jun  1 22:55:11 2011
@@ -75,7 +75,7 @@
       <scope>test</scope>
     </dependency>
     
-    <!-- To make sure the javadocs get built before this module -->
+    <!-- To make sure the scaladocs get built before this module -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>apollo-dto</artifactId>
@@ -83,27 +83,27 @@
       <classifier>javadoc</classifier>
       <scope>test</scope>
     </dependency>
-    <!-- <dependency>
+    <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>apollo-broker</artifactId>
       <version>1.0-SNAPSHOT</version>
-      <classifier>javadoc</classifier>
+      <classifier>scaladoc</classifier>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>apollo-transport</artifactId>
       <version>1.0-SNAPSHOT</version>
-      <classifier>javadoc</classifier>
+      <classifier>scaladoc</classifier>
       <scope>test</scope>
     </dependency>    
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>apollo-util</artifactId>
       <version>1.0-SNAPSHOT</version>
-      <classifier>javadoc</classifier>
+      <classifier>scaladoc</classifier>
       <scope>test</scope>
-    </dependency>   -->  
+    </dependency>    
 
   </dependencies>
 
@@ -143,25 +143,25 @@
                   <classifier>javadoc</classifier> 
                   <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-dto</outputDirectory>
                 </artifactItem>
-                <!-- <artifactItem>
+                <artifactItem>
                   <groupId>org.apache.activemq</groupId>
                   <artifactId>apollo-broker</artifactId>
-                  <classifier>javadoc</classifier> 
+                  <classifier>scaladoc</classifier> 
                   <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-broker</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.activemq</groupId>
                   <artifactId>apollo-transport</artifactId>
-                  <classifier>javadoc</classifier> 
+                  <classifier>scaladoc</classifier> 
                   <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-transport</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.activemq</groupId>
                   <artifactId>apollo-util</artifactId>
-                  <classifier>javadoc</classifier> 
+                  <classifier>scaladoc</classifier> 
                   <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-util</outputDirectory>
                 </artifactItem>
-                 -->
+                
               </artifactItems>
               <!-- other configurations here -->
             </configuration>

Modified: activemq/activemq-apollo/trunk/apollo-website/src/community/developers.page
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/community/developers.page?rev=1130337&r1=1130336&r2=1130337&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/community/developers.page (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/community/developers.page Wed Jun  1
22:55:11 2011
@@ -39,10 +39,9 @@ Ready to start hacking on ${project_name
 
 # API Reference
 
-* [`apollo-broker` API](../documentation/api/apollo-broker/index.html)
 * [`apollo-dto` API](../documentation/api/apollo-dto/index.html)
-* [`apollo-store` API](../documentation/api/apollo-store/index.html)
-* [`apollo-transport` API](../documentation/api/apollo-transport/index.html)
 * [`apollo-util` API](../documentation/api/apollo-util/index.html)
+* [`apollo-transport` API](../documentation/api/apollo-transport/index.html)
+* [`apollo-broker` API](../documentation/api/apollo-broker/index.html)
 
 Looking for the website documentation of a different ${project_name} [version](${website_base_url}/versions/index.html)?

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1130337&r1=1130336&r2=1130337&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Wed Jun  1 22:55:11 2011
@@ -113,7 +113,7 @@
     <snakeyaml-version>1.7</snakeyaml-version>
       
     <!-- maven plugin versions -->
-    <maven-scala-plugin-version>2.15.0</maven-scala-plugin-version>
+    <maven-scala-plugin-version>2.15.2</maven-scala-plugin-version>
     <maven-surefire-plugin-version>2.4.3</maven-surefire-plugin-version>
     <jetty-plugin-version>7.0.1.v20091125</jetty-plugin-version>
     
@@ -663,6 +663,7 @@
               </dependency>
             </dependencies>
           </plugin>
+          
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -671,11 +672,52 @@
               <test>false</test>
             </configuration>
           </plugin>
-        </plugins>
+          
+          <!-- Generate the Scala Docs so that they can be included in the javadoc artifact
-->
+          <plugin>
+            <groupId>org.scala-tools</groupId>
+            <artifactId>maven-scala-plugin</artifactId>
+            <version>${maven-scala-plugin-version}</version>
+            <executions>
+              <execution>
+                <id>doc</id>
+                <phase>process-classes</phase>
+                <goals>
+                  <goal>doc</goal>
+                </goals>
+                <configuration>
+                  <jvmArgs>
+                    <jvmArg>-Xmx1024m</jvmArg>
+                    <jvmArg>-Xss8m</jvmArg>
+                  </jvmArgs>
+                  <scalaVersion>${scala-version}</scalaVersion>
+                </configuration>                
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>2.3.1</version>
+            <executions>
+              <execution>
+                <id>scaladoc</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <classesDirectory>${project.build.directory}/site/scaladocs</classesDirectory>
+                  <classifier>scaladoc</classifier>
+                </configuration>                
+              </execution>
+            </executions>
+          </plugin>
+          
+        </plugins> 
       </build>
     </profile>
 
-
     <!-- enables extra repositories which may have some
          goodies that have not reached central yet -->
     <profile>



Mime
View raw message