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/04 13:29:42 UTC
svn commit: r1030905 - in /incubator/isis/trunk: ./ applib/src/docbkx/guide/
release/ support/ support/archetypes/ support/archetypes/application/
support/archetypes/exploration/ support/archetypes/scimpi/
support/src/site/apt/
Author: danhaywood
Date: Thu Nov 4 12:29:42 2010
New Revision: 1030905
URL: http://svn.apache.org/viewvc?rev=1030905&view=rev
Log:
further slight mods to the build process, see https://cwiki.apache.org/confluence/display/ISIS/BuildProcess
Modified:
incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
incubator/isis/trunk/pom.xml
incubator/isis/trunk/release/pom.xml
incubator/isis/trunk/support/archetypes/application/pom.xml
incubator/isis/trunk/support/archetypes/exploration/pom.xml
incubator/isis/trunk/support/archetypes/pom.xml
incubator/isis/trunk/support/archetypes/scimpi/pom.xml
incubator/isis/trunk/support/pom.xml
incubator/isis/trunk/support/src/site/apt/jottings.apt
Modified: incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml (original)
+++ incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml Thu Nov 4 12:29:42 2010
@@ -664,8 +664,8 @@
to confirm their exact status.</para>
<para>You'll also find coverage of the object store
- <acronym>API</acronym> itself in this document, see <xref
- linkend="chp.ObjectStoreApi" />. Most users of the framework are
+ <acronym>API</acronym> itself in the <filename>core</filename> documentation.
+ Most users of the framework are
unlikely to write their own object store, of course, though we hope that
over time new implementations will be written by the community.</para>
</sect1>
@@ -793,17 +793,8 @@
</listitem>
</itemizedlist>
- <para>You'll find further coverage of the remoting APIs in <xref
- linkend="chp.RemotingApi" />. Detailed documentation of the
- <acronym>http</acronym> transport implementation in the HTTP Remoting
- module (in <filename>alternates/http-remoting</filename>) module, and
- documentation for the xstream implementation is in the XStream
- Marshalling module (in
- <filename>alternates/xstream-marshalling</filename>).</para>
-
- <para>There's also further coverage of deploying applications in
- client/server mode in <xref
- linkend="chp.DeployingIsisApplications" />.</para>
+ <para>You'll find further coverage of the remoting APIs and how to deploy applications in
+ client/server mode in the <filename>alternatives/remoting</filename> documentation.</para>
</sect1>
<sect1>
@@ -901,10 +892,6 @@
authorization; the exact configuration to use here will depend both on
the implementation chosen (file-based, LDAP or some other) and whether
running in client/server mode or not.</para>
-
- <para>The main coverage of the topic of deployment options (which
- repeats some of the above) can be found in this document, in <xref
- linkend="chp.DeployingIsisApplications" />.</para>
</sect1>
<sect1>
Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Thu Nov 4 12:29:42 2010
@@ -24,13 +24,12 @@
(eg for testing and logging frameworks).
</description>
+ <!-- See https://cwiki.apache.org/confluence/display/ISIS/MavenBuildProfiles for full info on different options -->
+
<!-- 1. building code: (-o flag recommended once dependencies/plugins downloaded) -->
- <!-- mvn clean install -o -->
- <!-- mvn clean install -D build=full -o -->
- <!-- mvn clean install -D modules=all -o -->
- <!-- mvn clean install -D modules=all -D build=full -o -->
-
+ <!-- mvn clean install -o -->
+ <!-- mvn clean install -D modules=all -o -->
<!-- 2. building site/docs: (-o flag recommended once dependencies/plugins downloaded) -->
@@ -1269,6 +1268,8 @@
<profile>
<id>modules-standard</id>
+ <!-- The standard set for a smoke test; if this builds we're probably ok, since supports both build (clean install) and site (site-deploy)
+ If fact, these are also the modules that make up the site. Note that 'examples' and 'release' are omitted -->
<activation>
<activeByDefault>true</activeByDefault>
<property>
@@ -1282,11 +1283,33 @@
<module>defaults</module>
<module>alternatives</module>
<module>viewer</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>modules-all</id>
+ <!-- This is every module that can be built (clean, install).
+ Do not use with site-deploy, because includes 'release' and 'examples' that are not part of the site -->
+ <activation>
+ <property>
+ <name>modules</name>
+ <value>all</value>
+ </property>
+ </activation>
+ <modules>
+ <module>site-skin</module>
+ <module>applib</module>
+ <module>core</module>
+ <module>defaults</module>
+ <module>alternatives</module>
+ <module>viewer</module>
+ <module>support</module>
+ <module>examples</module>
<module>release</module>
</modules>
</profile>
<profile>
<id>modules-skin</id>
+ <!-- prereq for running site-deploy -->
<activation>
<property>
<name>modules</name>
@@ -1297,8 +1320,10 @@
<module>site-skin</module>
</modules>
</profile>
+
<profile>
<id>modules-applib</id>
+ <!-- To quickly build -->
<activation>
<property>
<name>modules</name>
@@ -1391,26 +1416,18 @@
</activation>
<modules>
<module>support</module>
- <module>release</module>
</modules>
</profile>
<profile>
- <id>all</id>
+ <id>modules-release</id>
<activation>
<property>
<name>modules</name>
- <value>all</value>
+ <value>release</value>
</property>
</activation>
<modules>
- <module>applib</module>
- <module>core</module>
- <module>defaults</module>
- <module>alternatives</module>
- <module>viewer</module>
<module>release</module>
- <module>examples</module>
- <module>support</module>
</modules>
</profile>
</profiles>
Modified: incubator/isis/trunk/release/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/release/pom.xml?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/release/pom.xml (original)
+++ incubator/isis/trunk/release/pom.xml Thu Nov 4 12:29:42 2010
@@ -3,10 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- inherit directly from the apache parent because there's no need
+ to bring in any of the build or reporting plugins -->
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>isis-parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
</parent>
<artifactId>release</artifactId>
@@ -52,6 +54,19 @@
<isis.alternatives-embedded.version>0.1-SNAPSHOT</isis.alternatives-embedded.version>
</properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- defined only to be consistent with the isis-parent build;
+ not otherwise used -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<dependencyManagement>
<dependencies>
Modified: incubator/isis/trunk/support/archetypes/application/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/pom.xml?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/pom.xml Thu Nov 4 12:29:42 2010
@@ -17,6 +17,10 @@
<packaging>maven-archetype</packaging>
+ <properties>
+ <siteBaseDir>../../..</siteBaseDir>
+ </properties>
+
<build>
<extensions>
<extension>
Modified: incubator/isis/trunk/support/archetypes/exploration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/exploration/pom.xml?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/exploration/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/exploration/pom.xml Thu Nov 4 12:29:42 2010
@@ -16,6 +16,10 @@
<packaging>maven-archetype</packaging>
+ <properties>
+ <siteBaseDir>../../..</siteBaseDir>
+ </properties>
+
<build>
<extensions>
<extension>
Modified: incubator/isis/trunk/support/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/pom.xml?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/pom.xml Thu Nov 4 12:29:42 2010
@@ -22,6 +22,10 @@
<module>scimpi</module>
</modules>
+ <properties>
+ <siteBaseDir>../..</siteBaseDir>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
Modified: incubator/isis/trunk/support/archetypes/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/scimpi/pom.xml?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/scimpi/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/scimpi/pom.xml Thu Nov 4 12:29:42 2010
@@ -16,6 +16,10 @@
<packaging>maven-archetype</packaging>
+ <properties>
+ <siteBaseDir>../../..</siteBaseDir>
+ </properties>
+
<build>
<extensions>
<extension>
Modified: incubator/isis/trunk/support/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/pom.xml?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/support/pom.xml (original)
+++ incubator/isis/trunk/support/pom.xml Thu Nov 4 12:29:42 2010
@@ -16,8 +16,6 @@
<properties>
<!-- REVIEW -->
<current40xVersion>4.0</current40xVersion>
- <!-- REVIEW -->
- <dependency.locations.enabled>false</dependency.locations.enabled>
<siteBaseDir>..</siteBaseDir>
Modified: incubator/isis/trunk/support/src/site/apt/jottings.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/src/site/apt/jottings.apt?rev=1030905&r1=1030904&r2=1030905&view=diff
==============================================================================
--- incubator/isis/trunk/support/src/site/apt/jottings.apt (original)
+++ incubator/isis/trunk/support/src/site/apt/jottings.apt Thu Nov 4 12:29:42 2010
@@ -29,7 +29,7 @@ Building an exploration application from
At the command prompt...
- [In all cases, you can use "mvn -o ..." to force maven to run offline.
+ In all cases, you can use "mvn -o ..." to force maven to run offline.
In the trunk/support directory: Run "mvn install" to install the archetypes.