activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1130829 - in /activemq/activemq-apollo/trunk: apollo-util/pom.xml apollo-website/pom.xml apollo-website/src/WEB-INF/web.xml apollo-website/src/community/building.page apollo-website/src/community/faq.page pom.xml
Date Thu, 02 Jun 2011 21:35:36 GMT
Author: chirino
Date: Thu Jun  2 21:35:36 2011
New Revision: 1130829

URL: http://svn.apache.org/viewvc?rev=1130829&view=rev
Log:
Simplifying build a bit.

Modified:
    activemq/activemq-apollo/trunk/apollo-util/pom.xml
    activemq/activemq-apollo/trunk/apollo-website/pom.xml
    activemq/activemq-apollo/trunk/apollo-website/src/WEB-INF/web.xml
    activemq/activemq-apollo/trunk/apollo-website/src/community/building.page
    activemq/activemq-apollo/trunk/apollo-website/src/community/faq.page
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/pom.xml?rev=1130829&r1=1130828&r2=1130829&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-util/pom.xml Thu Jun  2 21:35:36 2011
@@ -33,20 +33,6 @@
 
   <name>${project.artifactId}</name>
 
-  <repositories>
-    <!-- For the JNA dependency -->
-    <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Maven  Repository </name>
-      <url>http://download.java.net/maven/2</url>
-    </repository>
-    <repository>
-      <id>scala-tools.org</id>
-      <name>Scala-tools Maven2 Repository</name>
-      <url>http://scala-tools.org/repo-releases</url>
-    </repository>
-  </repositories>
-
   <dependencies>
                 
     <dependency>

Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1130829&r1=1130828&r2=1130829&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Thu Jun  2 21:35:36 2011
@@ -41,11 +41,7 @@
   </properties>
 
   <dependencies>
-    <!-- <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency> -->
+
     <dependency>
       <groupId>org.fusesource.scalate</groupId>
       <artifactId>scalate-wikitext</artifactId>
@@ -74,36 +70,6 @@
       <version>${scalate-version}</version>
       <scope>test</scope>
     </dependency>
-    
-    <!-- To make sure the scaladocs get built before this module -->
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-dto</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <classifier>javadoc</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-broker</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <classifier>scaladoc</classifier>
-      <scope>test</scope>
-    </dependency>    
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-transport</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <classifier>scaladoc</classifier>
-      <scope>test</scope>
-    </dependency>    
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-util</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <classifier>scaladoc</classifier>
-      <scope>test</scope>
-    </dependency>    
 
   </dependencies>
 
@@ -125,51 +91,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.2</version>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <phase>package</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.activemq</groupId>
-                  <artifactId>apollo-dto</artifactId>
-                  <classifier>javadoc</classifier> 
-                  <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-dto</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.activemq</groupId>
-                  <artifactId>apollo-broker</artifactId>
-                  <classifier>scaladoc</classifier> 
-                  <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-broker</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.activemq</groupId>
-                  <artifactId>apollo-transport</artifactId>
-                  <classifier>scaladoc</classifier> 
-                  <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-transport</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.activemq</groupId>
-                  <artifactId>apollo-util</artifactId>
-                  <classifier>scaladoc</classifier> 
-                  <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-util</outputDirectory>
-                </artifactItem>
-                
-              </artifactItems>
-              <!-- other configurations here -->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire-plugin-version}</version>
         <configuration>
@@ -262,5 +183,94 @@
       </plugin>
     </plugins>
   </reporting>
+  
+  <profiles>
+    
+    <!-- We only include the java doc when doing a release build since
+         that's when the javadoc actually gets generated -->
+    <profile>
+      <id>apache-release</id>
+
+      <dependencies>        
+        <dependency>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>apollo-dto</artifactId>
+          <version>1.0-SNAPSHOT</version>
+          <classifier>javadoc</classifier>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>apollo-broker</artifactId>
+          <version>1.0-SNAPSHOT</version>
+          <classifier>scaladoc</classifier>
+          <scope>test</scope>
+        </dependency>    
+        <dependency>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>apollo-transport</artifactId>
+          <version>1.0-SNAPSHOT</version>
+          <classifier>scaladoc</classifier>
+          <scope>test</scope>
+        </dependency>    
+        <dependency>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>apollo-util</artifactId>
+          <version>1.0-SNAPSHOT</version>
+          <classifier>scaladoc</classifier>
+          <scope>test</scope>
+        </dependency>    
+
+      </dependencies>        
+      <build>
+        
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>2.2</version>
+            <executions>
+              <execution>
+                <id>unpack</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.activemq</groupId>
+                      <artifactId>apollo-dto</artifactId>
+                      <classifier>javadoc</classifier> 
+                      <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-dto</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.apache.activemq</groupId>
+                      <artifactId>apollo-broker</artifactId>
+                      <classifier>scaladoc</classifier> 
+                      <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-broker</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.apache.activemq</groupId>
+                      <artifactId>apollo-transport</artifactId>
+                      <classifier>scaladoc</classifier> 
+                      <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-transport</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.apache.activemq</groupId>
+                      <artifactId>apollo-util</artifactId>
+                      <classifier>scaladoc</classifier> 
+                      <outputDirectory>${basedir}/target/sitegen/documentation/api/apollo-util</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+            
 </project>
 

Modified: activemq/activemq-apollo/trunk/apollo-website/src/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/WEB-INF/web.xml?rev=1130829&r1=1130828&r2=1130829&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/WEB-INF/web.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/WEB-INF/web.xml Thu Jun  2 21:35:36
2011
@@ -23,11 +23,7 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
 	version="2.5">
 
-  <display-name>Scalate Sample Local Wiki</display-name>
-
-  <description>
-    Scalate Sample Local Wiki
-  </description>
+  <display-name>Website</display-name>
 
   <filter>
     <filter-name>TemplateEngineFilter</filter-name>

Modified: activemq/activemq-apollo/trunk/apollo-website/src/community/building.page
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/community/building.page?rev=1130829&r1=1130828&r2=1130829&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/community/building.page (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/community/building.page Thu Jun  2 21:35:36
2011
@@ -44,7 +44,7 @@ To build ${project_name} maven has to be
 
 ### A normal build
 
-    mvn -P download install
+    mvn install
 
 Once the build completes, you will find the binary distribution of 
 ${project_name} located in the `apollo-distro/target` directory.
@@ -55,18 +55,18 @@ ${project_name} located in the `apollo-d
 The following avoids running all the unit test cases, we just skip the
 test running phase and not the building part
 
-    mvn -P download -Dtest=false install
+    mvn -Dtest=false install
 
 ### Using an IDE
 
 If you prefer to use an IDE then you can auto-generate the IDE's project
 files using maven plugins. e.g.
 
-    mvn -P download eclipse:eclipse
-  
-or
-
-    mvn -P download idea:idea
+    mvn eclipse:eclipse
+        
+or      
+        
+    mvn idea:idea
 
 ### Importing into Eclipse
 
@@ -79,7 +79,7 @@ on Windows).
 
 You can also get Maven to do this for you:
 
-    mvn -P download eclipse:add-maven-repo -Declipse.workspace=/path/to/the/workspace/ 
+    mvn eclipse:add-maven-repo -Declipse.workspace=/path/to/the/workspace/ 
 
 ### See Also
 

Modified: activemq/activemq-apollo/trunk/apollo-website/src/community/faq.page
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/community/faq.page?rev=1130829&r1=1130828&r2=1130829&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/community/faq.page (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/community/faq.page Thu Jun  2 21:35:36
2011
@@ -46,21 +46,11 @@ License](http://www.apache.org/licenses/
 
 See the [support guide](support.html) for more details.
 
-### How do I build Scalate?
+### How do I build ${project_name}?
 
 First [get the source](source.html) then see the [building
 guide](building.html)
 
-### Why does the Maven build not download jars?
-
-The default profile in maven does not include remote repos, so make sure
-you add the download profile when building for the first time. First [get
-the source](source.html) then see the [building guide](building.html).
-
-e.g.
-
-    mvn install -P download
-
 ### How do I contribute or become a committer?
 
 We love [contributions](contributing.html)! More details on how to

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1130829&r1=1130828&r2=1130829&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Thu Jun  2 21:35:36 2011
@@ -718,123 +718,115 @@
         </plugins> 
       </build>
     </profile>
-
-    <!-- enables extra repositories which may have some
-         goodies that have not reached central yet -->
-    <profile>
-      <id>download</id>
-      <repositories>
-    
-        <repository>
-          <id>apache.snapshots</id>
-          <url>https://repository.apache.org/content/repositories/snapshots</url>
-          <snapshots><enabled>true</enabled></snapshots>
-          <releases><enabled>false</enabled></releases>
-        </repository>
-    
-        <repository>
-          <id>fusesource-snapshots</id>
-          <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
-          <releases><enabled>false</enabled></releases>
-          <snapshots><enabled>true</enabled></snapshots>
-        </repository>
-
-        <repository>
-          <id>java.net.m2</id>
-          <url>http://download.java.net/maven/2</url>
-          <releases><enabled>true</enabled></releases>
-          <snapshots><enabled>false</enabled></snapshots>
-        </repository>
-        <repository>
-          <id>glassfish-repo-archive</id>
-          <url>http://maven.glassfish.org/content/groups/glassfish</url>
-          <releases><enabled>true</enabled></releases>
-          <snapshots><enabled>false</enabled></snapshots>
-        </repository>
-    
-        <repository>
-          <id>scala-tools.org-releases</id>
-          <url>http://scala-tools.org/repo-releases</url>
-          <releases><enabled>true</enabled></releases>
-          <snapshots><enabled>false</enabled></snapshots>
-        </repository>
-        <repository>
-          <id>scala-tools.org-snapshots</id>
-          <url>http://scala-tools.org/repo-snapshots</url>
-          <snapshots><enabled>true</enabled></snapshots>
-          <releases><enabled>false</enabled></releases>
-        </repository>
-    
-        <repository>
-          <id>shorrockin</id>
-          <url>http://maven.shorrockin.com</url>
-        </repository>
-    
-        <repository>
-          <id>oracleReleases</id>
-          <url>http://download.oracle.com/maven</url>
-          <layout>default</layout>
-        </repository>
-        
-        <repository>
-          <id>ops4j.sonatype.snapshots.deploy</id>
-          <name>OPS4J snapshot repository</name>
-          <url>https://oss.sonatype.org/content/repositories/ops4j-snapshots/</url>
-          <snapshots><enabled>true</enabled></snapshots>
-          <releases><enabled>false</enabled></releases>
-        </repository>
-
-        <!-- for net.sf.josql dependency not yet in central -->
-        <repository>
-          <id>com.fusesource.m2</id>
-          <url>http://repo.fusesource.com/nexus/content/groups/public/</url>
-          <releases><enabled>true</enabled></releases>
-          <snapshots><enabled>false</enabled></snapshots>
-        </repository>
-
-      </repositories>
-
-      <pluginRepositories>
-
-        <pluginRepository>
-          <id>apache-snapshots</id>
-          <url>https://repository.apache.org/content/repositories/snapshots</url>
-          <snapshots><enabled>true</enabled></snapshots>
-          <releases><enabled>false</enabled></releases>
-        </pluginRepository>
-
-        <pluginRepository>
-          <id>fusesource-snapshots</id>
-          <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
-          <releases><enabled>false</enabled></releases>
-          <snapshots><enabled>true</enabled></snapshots>
-        </pluginRepository>
-
-        <pluginRepository>
-          <id>scala-tools.org-releases</id>
-          <url>http://scala-tools.org/repo-releases</url>
-          <releases><enabled>true</enabled></releases>
-          <snapshots><enabled>false</enabled></snapshots>
-        </pluginRepository>
-    
-        <pluginRepository>
-          <id>scala-tools.org-snapshots</id>
-          <url>http://scala-tools.org/repo-snapshots</url>
-          <snapshots><enabled>true</enabled></snapshots>
-          <releases><enabled>false</enabled></releases>
-        </pluginRepository>
-
-        <pluginRepository>
-          <id>java.net-releases</id>
-          <url>http://download.java.net/maven/2</url>
-          <releases><enabled>true</enabled></releases>
-          <snapshots><enabled>false</enabled></snapshots>
-        </pluginRepository>
-
-      </pluginRepositories>
-    </profile>
-    
   </profiles>
+  <repositories>
+
+    <repository>
+      <id>apache.snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <snapshots><enabled>true</enabled></snapshots>
+      <releases><enabled>false</enabled></releases>
+    </repository>
+
+    <repository>
+      <id>fusesource-snapshots</id>
+      <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
+      <releases><enabled>false</enabled></releases>
+      <snapshots><enabled>true</enabled></snapshots>
+    </repository>
+
+    <repository>
+      <id>java.net.m2</id>
+      <url>http://download.java.net/maven/2</url>
+      <releases><enabled>true</enabled></releases>
+      <snapshots><enabled>false</enabled></snapshots>
+    </repository>
+    <repository>
+      <id>glassfish-repo-archive</id>
+      <url>http://maven.glassfish.org/content/groups/glassfish</url>
+      <releases><enabled>true</enabled></releases>
+      <snapshots><enabled>false</enabled></snapshots>
+    </repository>
+
+    <repository>
+      <id>scala-tools.org-releases</id>
+      <url>http://scala-tools.org/repo-releases</url>
+      <releases><enabled>true</enabled></releases>
+      <snapshots><enabled>false</enabled></snapshots>
+    </repository>
+    <repository>
+      <id>scala-tools.org-snapshots</id>
+      <url>http://scala-tools.org/repo-snapshots</url>
+      <snapshots><enabled>true</enabled></snapshots>
+      <releases><enabled>false</enabled></releases>
+    </repository>
+
+    <repository>
+      <id>shorrockin</id>
+      <url>http://maven.shorrockin.com</url>
+    </repository>
+
+    <repository>
+      <id>oracleReleases</id>
+      <url>http://download.oracle.com/maven</url>
+      <layout>default</layout>
+    </repository>
+  
+    <repository>
+      <id>ops4j.sonatype.snapshots.deploy</id>
+      <name>OPS4J snapshot repository</name>
+      <url>https://oss.sonatype.org/content/repositories/ops4j-snapshots/</url>
+      <snapshots><enabled>true</enabled></snapshots>
+      <releases><enabled>false</enabled></releases>
+    </repository>
+
+    <!-- for net.sf.josql dependency not yet in central -->
+    <repository>
+      <id>com.fusesource.m2</id>
+      <url>http://repo.fusesource.com/nexus/content/groups/public/</url>
+      <releases><enabled>true</enabled></releases>
+      <snapshots><enabled>false</enabled></snapshots>
+    </repository>
+
+  </repositories>
+
+  <pluginRepositories>
+
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <snapshots><enabled>true</enabled></snapshots>
+      <releases><enabled>false</enabled></releases>
+    </pluginRepository>
+
+    <pluginRepository>
+      <id>fusesource-snapshots</id>
+      <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
+      <releases><enabled>false</enabled></releases>
+      <snapshots><enabled>true</enabled></snapshots>
+    </pluginRepository>
+
+    <pluginRepository>
+      <id>scala-tools.org-releases</id>
+      <url>http://scala-tools.org/repo-releases</url>
+      <releases><enabled>true</enabled></releases>
+      <snapshots><enabled>false</enabled></snapshots>
+    </pluginRepository>
+
+    <pluginRepository>
+      <id>scala-tools.org-snapshots</id>
+      <url>http://scala-tools.org/repo-snapshots</url>
+      <snapshots><enabled>true</enabled></snapshots>
+      <releases><enabled>false</enabled></releases>
+    </pluginRepository>
+
+    <pluginRepository>
+      <id>java.net-releases</id>
+      <url>http://download.java.net/maven/2</url>
+      <releases><enabled>true</enabled></releases>
+      <snapshots><enabled>false</enabled></snapshots>
+    </pluginRepository>
 
+  </pluginRepositories>
 
 </project>



Mime
View raw message