incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1025479 [3/3] - in /incubator/isis/trunk: ./ alternatives/ alternatives/bytecode/ alternatives/bytecode/identity/ alternatives/bytecode/javassist/ alternatives/bytecode/src/docbkx/guide/ alternatives/bytecode/src/site/ alternatives/objects...
Date Wed, 20 Oct 2010 10:37:17 GMT
Modified: incubator/isis/trunk/defaults/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/src/site/site.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/src/site/site.xml (original)
+++ incubator/isis/trunk/defaults/src/site/site.xml Wed Oct 20 10:37:14 2010
@@ -21,8 +21,8 @@
 		</menu>
 
 		<menu name="Documentation">
-			<item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName}.pdf" />
-			<item name="${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html"
/>
+			<item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
+			<item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/${docbkxGuideName}/${docbkxGuideName}.html"
/>
 		</menu>
 	</body>
 </project>

Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Wed Oct 20 10:37:14 2010
@@ -81,7 +81,7 @@
         <trunkBaseDir>${project.build.directory}/${siteBaseDir}/..</trunkBaseDir>
         <checkstyle.configLocation>${trunkBaseDir}/src/main/checkstyle/checkstyle.xml</checkstyle.configLocation>
         <pmd.ruleset>${trunkBaseDir}/src/main/pmd/pmd.xml</pmd.ruleset>
-        
+
         <projectUrl>${project.url}</projectUrl>
     </properties>
 
@@ -740,22 +740,25 @@
     <reporting>
         <excludeDefaults>true</excludeDefaults>
         <plugins>
-            <!--
-            top-level pom (this pom) should have inherited=false, and: 
-            license, project-team, issue-tracking, scm, cim, mailing-list, dependency-management,
plugin-management, modules, summary   
-             -->
-            <!--
-            packaging=pom should have inherited=false, and: 
-            dependency-management, plugin-management, modules, summary   
-            -->
-            <!-- 
-            packaging=jar should have inherited=false, and: 
-            dependencies, dependencyConvergence, plugins, summary
-             -->
+            <!-- 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 -->
+            <!-- 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, 
+                and: dependency-management (*), dependencies, dependency-convergence, plugins,

+                summary -->
+            <!-- (*) dependency-management should only be added if there 
+                is a dependencyManagement section present -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <inherited>true</inherited>
+                <!-- 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>
                 <reportSets>
                     <reportSet>
                         <inherited>false</inherited>
@@ -768,13 +771,11 @@
                             <report>mailing-list</report>
                             <report>dependency-management</report>
                             <report>plugin-management</report>
+                            <report>plugins</report>
                             <report>modules</report>
                             <report>summary</report>
-                            <!--   
-                            <report>dependencies</report>
-                            <report>dependencyConvergence</report>
-                            <report>plugins</report>
-                            -->
+                            <!-- <report>dependencies</report> -->
+                            <!-- <report>dependency-convergence</report> -->
                         </reports>
                     </reportSet>
                 </reportSets>

Modified: incubator/isis/trunk/site-skin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/site-skin/pom.xml (original)
+++ incubator/isis/trunk/site-skin/pom.xml Wed Oct 20 10:37:14 2010
@@ -12,16 +12,6 @@
     <groupId>org.apache.isis.skins</groupId>
     <artifactId>classic-skin</artifactId>
     <version>1.0</version>
-    <name>Classic Skin</name>
+    <name>Isis Skin</name>
 
-   <scm>
-        <connection>scm:svn:http://apache.isis.svn/svnroot/trunk/site-skin</connection>
-        <developerConnection>scm:svn:https://apache.isis.svn/svnroot/trunk/site-skin</developerConnection>
-        <url>http://dev.isis.apache.org/trac/browser/framework/trunk/site-skin</url>
-    </scm>
-
-	<properties>
-		<checkstyle.configLocation>../src/main/checkstyle/checkstyle.xml</checkstyle.configLocation>
-		<pmd.ruleset>../src/main/pmd/pmd.xml</pmd.ruleset>
-	</properties>
 </project>

Modified: incubator/isis/trunk/viewer/dnd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/pom.xml (original)
+++ incubator/isis/trunk/viewer/dnd/pom.xml Wed Oct 20 10:37:14 2010
@@ -31,18 +31,40 @@
 		</plugins>
 	</build>
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>dependencies</report>
+                            <report>dependency-convergence</report>
+                            <report>plugins</report>
+                            <report>summary</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
 	<dependencies>
-    
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>runtime</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.isis.defaults</groupId>
             <artifactId>objectstore</artifactId>

Modified: incubator/isis/trunk/viewer/dnd/src/docbkx/guide/isis-dnd-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/docbkx/guide/isis-dnd-viewer.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/docbkx/guide/isis-dnd-viewer.xml (original)
+++ incubator/isis/trunk/viewer/dnd/src/docbkx/guide/isis-dnd-viewer.xml Wed Oct 20 10:37:14
2010
@@ -21,7 +21,7 @@
 -->
 <book>
   <bookinfo>
-    <title><?eval ${docbkx.guideTitle}?></title>
+    <title><?eval ${docbkxGuideTitle}?></title>
     <subtitle>Customization, Configuration and Deployment Guide</subtitle>
     <releaseinfo><?eval ${project.version}?></releaseinfo>
 

Modified: incubator/isis/trunk/viewer/dnd/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/site/site.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/site/site.xml (original)
+++ incubator/isis/trunk/viewer/dnd/src/site/site.xml Wed Oct 20 10:37:14 2010
@@ -21,8 +21,8 @@
 		</menu>
 
         <menu name="Documentation">
-            <item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName}.pdf"
/>
-            <item name="${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html"
/>
+            <item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf"
/>
+            <item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/${docbkxGuideName}/${docbkxGuideName}.html"
/>
 			<!-- 
 			<menu name="For Contributors">
 				<item name="Design Notes" href="design-notes.html" />

Modified: incubator/isis/trunk/viewer/html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/pom.xml (original)
+++ incubator/isis/trunk/viewer/html/pom.xml Wed Oct 20 10:37:14 2010
@@ -31,6 +31,27 @@
 		</plugins>
 	</build>
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>dependency-convergence</report>
+                            <report>dependencies</report>
+                            <report>plugins</report>
+                            <report>summary</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>

Modified: incubator/isis/trunk/viewer/html/src/docbkx/guide/isis-html-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/docbkx/guide/isis-html-viewer.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/docbkx/guide/isis-html-viewer.xml (original)
+++ incubator/isis/trunk/viewer/html/src/docbkx/guide/isis-html-viewer.xml Wed Oct 20 10:37:14
2010
@@ -21,7 +21,7 @@
 -->
 <book>
   <bookinfo>
-    <title><?eval ${docbkx.guideTitle}?></title>
+    <title><?eval ${docbkxGuideTitle}?></title>
     <subtitle>Customization, Configuration and Deployment Guide</subtitle>
     <releaseinfo><?eval ${project.version}?></releaseinfo>
 

Modified: incubator/isis/trunk/viewer/html/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/site/site.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/site/site.xml (original)
+++ incubator/isis/trunk/viewer/html/src/site/site.xml Wed Oct 20 10:37:14 2010
@@ -21,8 +21,8 @@
 		</menu>
 
 		<menu name="Documentation">
-			<item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName}.pdf" />
-			<item name="${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html"
/>
+			<item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
+			<item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/${docbkxGuideName}/${docbkxGuideName}.html"
/>
 		</menu>
 
 		<menu name="Maven Reports" ref="reports" />

Modified: incubator/isis/trunk/viewer/junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/pom.xml (original)
+++ incubator/isis/trunk/viewer/junit/pom.xml Wed Oct 20 10:37:14 2010
@@ -22,6 +22,37 @@
         <docbkxGuideName>isis-junit-support</docbkxGuideName>
 	</properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.agilejava.docbkx</groupId>
+                <artifactId>docbkx-maven-plugin</artifactId>
+                <inherited>false</inherited>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>dependency-convergence</report>
+                            <report>dependencies</report>
+                            <report>plugins</report>
+                            <report>summary</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.alternatives.progmodel</groupId>

Modified: incubator/isis/trunk/viewer/junit/src/docbkx/guide/isis-junit-support.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/docbkx/guide/isis-junit-support.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/docbkx/guide/isis-junit-support.xml (original)
+++ incubator/isis/trunk/viewer/junit/src/docbkx/guide/isis-junit-support.xml Wed Oct 20 10:37:14
2010
@@ -21,7 +21,7 @@
 -->
 <book>
   <bookinfo>
-    <title><?eval ${docbkx.guideTitle}?></title>
+    <title><?eval ${docbkxGuideTitle}?></title>
     <subtitle>Developers Guide</subtitle>
     <releaseinfo><?eval ${project.version}?></releaseinfo>
 

Modified: incubator/isis/trunk/viewer/junit/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/site/site.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/site/site.xml (original)
+++ incubator/isis/trunk/viewer/junit/src/site/site.xml Wed Oct 20 10:37:14 2010
@@ -21,8 +21,8 @@
 		</menu>
 
 		<menu name="Documentation">
-			<item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName}.pdf" />
-			<item name="${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html"
/>
+			<item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
+			<item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/${docbkxGuideName}/${docbkxGuideName}.html"
/>
 		</menu>
 
 		<menu name="Maven Reports" ref="reports" />

Modified: incubator/isis/trunk/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/pom.xml Wed Oct 20 10:37:14 2010
@@ -39,14 +39,15 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<inherited>true</inherited>
+				<inherited>false</inherited>
 				<reportSets>
 					<reportSet>
-						<inherited>true</inherited>
+						<inherited>false</inherited>
 						<reports>
-							<report>dependencies</report>
-							<report>dependency-convergence</report>
-							<report>plugins</report>
+                            <report>dependency-management</report>
+                            <report>plugins</report>
+							<report>modules</report>
+                            <report>summary</report>
 						</reports>
 					</reportSet>
 				</reportSets>

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml Wed Oct 20 10:37:14 2010
@@ -16,6 +16,27 @@
         <siteBaseDir>../../..</siteBaseDir>
 	</properties>
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>dependency-convergence</report>
+                            <report>dependencies</report>
+                            <report>plugins</report>
+                            <report>summary</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>

Modified: incubator/isis/trunk/viewer/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/pom.xml Wed Oct 20 10:37:14 2010
@@ -34,6 +34,27 @@
 		</plugins>
 	</build>
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>dependency-management</report>
+                            <report>plugins</report>
+                            <report>modules</report>
+                            <report>summary</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
 	<dependencyManagement>
 		<dependencies>
 	        <dependency>

Modified: incubator/isis/trunk/viewer/scimpi/servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/servlet/pom.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/servlet/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/servlet/pom.xml Wed Oct 20 10:37:14 2010
@@ -16,6 +16,27 @@
         <siteBaseDir>../../..</siteBaseDir>
 	</properties>
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>dependency-convergence</report>
+                            <report>dependencies</report>
+                            <report>plugins</report>
+                            <report>summary</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.viewer</groupId>

Modified: incubator/isis/trunk/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/src/docbkx/guide/isis-scimpi-viewer.xml Wed Oct 20
10:37:14 2010
@@ -21,7 +21,7 @@
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <book>
   <bookinfo>
-    <title><?eval ${docbkx.guideTitle}?></title>
+    <title><?eval ${docbkxGuideTitle}?></title>
     <subtitle>Customization, Configuration and Deployment Guide</subtitle>
     <releaseinfo><?eval ${project.version}?></releaseinfo>
 

Modified: incubator/isis/trunk/viewer/scimpi/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/src/site/site.xml?rev=1025479&r1=1025478&r2=1025479&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/src/site/site.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/src/site/site.xml Wed Oct 20 10:37:14 2010
@@ -24,8 +24,8 @@
 		<menu name="Modules" ref="modules" />
 
 		<menu name="Documentation">
-			<item name="${docbkx.guideTitle} (PDF)" href="docbkx/pdf/${docbkx.guideName}.pdf" />
-			<item name="${docbkx.guideTitle} (HTML)" href="docbkx/html/${docbkx.guideName}/${docbkx.guideName}.html"
/>
+			<item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
+			<item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/${docbkxGuideName}/${docbkxGuideName}.html"
/>
 			<!--
 			<item name="Getting Started" href="getting-started.html" />
 			<item name="Creating a Scimpi Webapp" href="creating-webapp.html" />



Mime
View raw message