You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/18 13:22:33 UTC
svn commit: r1036432 - in /incubator/isis/trunk: applib/pom.xml pom.xml
src/site/apt/contributors-building.apt src/site/apt/contributors-devenv.apt
src/site/site.xml
Author: danhaywood
Date: Thu Nov 18 12:22:33 2010
New Revision: 1036432
URL: http://svn.apache.org/viewvc?rev=1036432&view=rev
Log:
minor edits to trunk site
Modified:
incubator/isis/trunk/applib/pom.xml
incubator/isis/trunk/pom.xml
incubator/isis/trunk/src/site/apt/contributors-building.apt
incubator/isis/trunk/src/site/apt/contributors-devenv.apt
incubator/isis/trunk/src/site/site.xml
Modified: incubator/isis/trunk/applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/pom.xml?rev=1036432&r1=1036431&r2=1036432&view=diff
==============================================================================
--- incubator/isis/trunk/applib/pom.xml (original)
+++ incubator/isis/trunk/applib/pom.xml Thu Nov 18 12:22:33 2010
@@ -38,11 +38,12 @@
</build>
<reporting>
+ <excludeDefaults>true</excludeDefaults>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin}</version>
+ <version>${maven-project-info-reports-plugin}</version>
<inherited>false</inherited>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1036432&r1=1036431&r2=1036432&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Thu Nov 18 12:22:33 2010
@@ -779,11 +779,10 @@
</build>
<reporting>
- <excludeDefaults>true</excludeDefaults>
<plugins>
<!-- top-level pom (this pom) should have a reportSet with inherited=false,
and: license, project-team, issue-tracking, scm, cim, mailing-list, dependency-management,
- plugin-management, plugins, modules, summary -->
+ plugin-management, plugins, modules -->
<!-- parent pom of submodules should have a reportSet with inherited=false,
and: dependency-management (*), plugins, modules, summary. -->
<!-- packaging=jar should have a reportSet with inherited=false,
@@ -794,30 +793,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin}</version>
- <!-- it seems to be necessary to set inherited=false, otherwise
- the default reportSet seems to be inherited even if explicitly overridden
- in the inheriting POM by a different reportSet. In practice this is no great
- hardship, because each level will have a different reportSet anyway (see
- comment above) -->
- <inherited>false</inherited>
+ <!-- TODO: for some reason the reportSets seems to be being
+ ignored and generating a full set; not sure why -->
+ <inherited>false</inherited>
<reportSets>
- <reportSet>
- <inherited>false</inherited>
- <reports>
+ <reportSet>
+ <reports>
+ <report>scm</report>
<report>license</report>
<report>project-team</report>
<report>issue-tracking</report>
- <report>scm</report>
<report>cim</report>
- <report>mailing-list</report>
- <report>dependency-management</report>
- <report>plugin-management</report>
+ <report>mailing-list</report>
+ <report>dependency-management</report>
+ <report>plugin-management</report>
<report>plugins</report>
- <report>modules</report>
- <report>summary</report>
+ <report>modules</report>
<!-- <report>dependencies</report> -->
<!-- <report>dependency-convergence</report> -->
+ <!-- <report>summary</report> -->
</reports>
</reportSet>
</reportSets>
Modified: incubator/isis/trunk/src/site/apt/contributors-building.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/apt/contributors-building.apt?rev=1036432&r1=1036431&r2=1036432&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/apt/contributors-building.apt (original)
+++ incubator/isis/trunk/src/site/apt/contributors-building.apt Thu Nov 18 12:22:33 2010
@@ -23,7 +23,7 @@ Building Isis
Prerequisites
- Install {{{http://maven.apache.org}Maven}} 3.0.
+ Install {{{http://maven.apache.org}Maven}} 2.2.1 (we believe 3.0.0 also works).
Build the Code Base
@@ -31,19 +31,19 @@ Build the Code Base
Next, you can build trunk. This will recursively the entire tree. If it's the first time you're running this, then it'll take some time downloading prerequisites...
a good time to go grab a coffee.
-+----------------------------------------------------+
-mvn clean install -P all
-+----------------------------------------------------+
++-------------------------------------------------------------------+
+mvn clean install -D modules=all
++-------------------------------------------------------------------+
You can also build the site and documentation using:
-+----------------------------------------------------+
-mvn site-deploy -P deploy-local
-+----------------------------------------------------+
++-------------------------------------------------------------------+
+mvn site-deploy -D modules=standard -D site=full -D deploy=local
++-------------------------------------------------------------------+
This will deploy the site to <<</tmp/m2-sites/isis>>>, where you can check it out.
There are a few other variations and profiles; there's a summary in the <<<isis-parent/pom.xml>>> itself.
-
\ No newline at end of file
+
Modified: incubator/isis/trunk/src/site/apt/contributors-devenv.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/apt/contributors-devenv.apt?rev=1036432&r1=1036431&r2=1036432&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/apt/contributors-devenv.apt (original)
+++ incubator/isis/trunk/src/site/apt/contributors-devenv.apt Thu Nov 18 12:22:33 2010
@@ -84,4 +84,4 @@ Setting up the Development Environment
* {{{./codequality/pmd.xml}pmd.xml}}
[]
-
\ No newline at end of file
+
Modified: incubator/isis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/site.xml?rev=1036432&r1=1036431&r2=1036432&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/site.xml (original)
+++ incubator/isis/trunk/src/site/site.xml Thu Nov 18 12:22:33 2010
@@ -23,6 +23,8 @@
<item name="License" href="license.html" />
</menu>
+ <menu name="Project Info" ref="reports"/>
+
<menu name="Getting Started">
<item name="Downloads" href="downloads.html" />
<item name="IDE Support" href="ide-support.html"/>
@@ -57,6 +59,8 @@
<item name="Defaults" href="defaults/index.html">
<item name="Object Store" href="defaults/objectstore/index.html">
</item>
+ <item name="Profile Store" href="defaults/profilestore/index.html">
+ </item>
<item name="Programming Model" href="defaults/progmodel/index.html">
</item>
<item name="Bytecode Provider" href="defaults/bytecode/index.html">
@@ -67,6 +71,8 @@
<item name="Alternatives" href="alternatives/index.html">
<item name="Object Stores" href="alternatives/objectstore/index.html">
</item>
+ <item name="Profile Stores" href="alternatives/profilestore/index.html">
+ </item>
<item name="Programming Models" href="alternatives/progmodel/index.html">
</item>
<item name="Bytecode Providers" href="alternatives/bytecode/index.html">