incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1134892 [1/2] - in /incubator/isis/branches/0.1.2-RC4-incubating/trunk: ./ core/ core/commons/ core/metamodel/ core/progmodel/ core/runtime/ core/webapp/ runtimes/dflt/objectstores/sql/ runtimes/dflt/objectstores/sql/impl/ src/docbkx/guide/
Date Sun, 12 Jun 2011 09:32:22 GMT
Author: danhaywood
Date: Sun Jun 12 09:32:21 2011
New Revision: 1134892

URL: http://svn.apache.org/viewvc?rev=1134892&view=rev
Log:
applying changes made in trunk since copied to branch

Added:
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/modules
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/msdf.sh
Modified:
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/commons/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/metamodel/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/progmodel/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/runtime/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/webapp/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/impl/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/pom.xml
    incubator/isis/branches/0.1.2-RC4-incubating/trunk/src/docbkx/guide/isis-contributors-guide.xml

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/commons/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/commons/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/commons/pom.xml Sun Jun 12 09:32:21 2011
@@ -1,39 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>core</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.isis.core</groupId>
-	<artifactId>commons</artifactId>
-	<name>Core Commons</name>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.isis</groupId>
+        <artifactId>core</artifactId>
+        <version>0.1.2-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.isis.core</groupId>
+    <artifactId>commons</artifactId>
+    <name>Core Commons</name>
 
-	<properties>
+    <properties>
         <siteBaseDir>../..</siteBaseDir>
-		<relativeUrl>core/commons/</relativeUrl>
-	</properties>
+        <relativeUrl>core/commons/</relativeUrl>
+    </properties>
 
     <!-- used in Site generation for relative references. -->
     <url>http://incubator.apache.org/isis/${relativeUrl}</url>
@@ -43,10 +36,10 @@
             <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>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -63,15 +56,15 @@
         </plugins>
     </reporting>
 
-	<dependencies>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.isis.core</groupId>
@@ -84,62 +77,12 @@
             <artifactId>applib</artifactId>
         </dependency>
 
-		<dependency>
-			<groupId>com.google.inject</groupId>
-			<artifactId>guice</artifactId>
-		</dependency>
-
-	</dependencies>
-
-    <!-- workaround for http://jira.codehaus.org/browse/MJAVADOC-298;
-    disabled at core, and re-enabled in all submodules except for testsupport -->
-    <profiles>
-        <profile>
-            <id>site-full</id>
-            <activation>
-                <property>
-                    <name>site</name>
-                    <value>full</value>
-                </property>
-            </activation>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    </profiles>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+    </dependencies>
+
 
 </project>

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/metamodel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/metamodel/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/metamodel/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/metamodel/pom.xml Sun Jun 12 09:32:21 2011
@@ -1,38 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>core</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.isis.core</groupId>
-	<artifactId>metamodel</artifactId>
-	<name>Core MetaModel</name>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.isis</groupId>
+        <artifactId>core</artifactId>
+        <version>0.1.2-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.isis.core</groupId>
+    <artifactId>metamodel</artifactId>
+    <name>Core MetaModel</name>
 
-	<properties>
+    <properties>
         <siteBaseDir>../..</siteBaseDir>
-		<relativeUrl>core/metamodel/</relativeUrl>
+        <relativeUrl>core/metamodel/</relativeUrl>
     </properties>
 
     <!-- used in Site generation for relative references. -->
@@ -43,10 +36,10 @@
             <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>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -63,79 +56,28 @@
         </plugins>
     </reporting>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis</groupId>
-			<artifactId>applib</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.isis</groupId>
+            <artifactId>applib</artifactId>
         </dependency>
-		<dependency>
-		    <groupId>org.apache.isis</groupId>
-		    <artifactId>applib</artifactId>
-		    <type>test-jar</type>
-		    <scope>test</scope>
+        <dependency>
+            <groupId>org.apache.isis</groupId>
+            <artifactId>applib</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>commons</artifactId>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>commons</artifactId>
         </dependency>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>testsupport</artifactId>
-		    <scope>test</scope>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>testsupport</artifactId>
+            <scope>test</scope>
         </dependency>
-	</dependencies>
-
-    <!-- workaround for http://jira.codehaus.org/browse/MJAVADOC-298;
-    disabled at core, and re-enabled in all submodules except for testsupport -->
-    <profiles>
-        <profile>
-            <id>site-full</id>
-            <activation>
-                <property>
-                    <name>site</name>
-                    <value>full</value>
-                </property>
-            </activation>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    </profiles>
+    </dependencies>
 
 </project>

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/pom.xml Sun Jun 12 09:32:21 2011
@@ -1,112 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>isis</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.isis</groupId>
+        <artifactId>isis</artifactId>
+        <version>0.1.2-incubating-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.apache.isis</groupId>
-	<artifactId>core</artifactId>
+    <groupId>org.apache.isis</groupId>
+    <artifactId>core</artifactId>
     <version>0.1.2-incubating-SNAPSHOT</version>
-	
-	<name>Isis Core</name>
-	
-	<description>
+
+    <name>Isis Core</name>
+
+    <description>
 		Core framework, providing metamodel, runtime and core APIs.
 		Does not include default implementations of those APIs, nor any viewers to
 		render the metamodel.
 	</description>
-	
-	<packaging>pom</packaging>
 
+    <packaging>pom</packaging>
 
-	<properties>
+
+    <properties>
         <siteBaseDir>..</siteBaseDir>
-		<relativeUrl>core/</relativeUrl>
-		
-        <!-- REVIEW -->
-		<current40xVersion>4.0</current40xVersion>
+        <relativeUrl>core/</relativeUrl>
+
         <!-- REVIEW -->
-		<dependency.locations.enabled>false</dependency.locations.enabled>
-        
-		<docbkxGuideTitle>Apache Isis Core</docbkxGuideTitle>
+        <dependency.locations.enabled>false</dependency.locations.enabled>
+
+        <docbkxGuideTitle>Apache Isis Core</docbkxGuideTitle>
         <docbkxGuideSubTitle>Architecture, APIs and Customization</docbkxGuideSubTitle>
-		<docbkxGuideName>isis-core</docbkxGuideName>	
+        <docbkxGuideName>isis-core</docbkxGuideName>
     </properties>
 
     <url>http://incubator.apache.org/isis/${relativeUrl}</url>
 
-	<modules>
+    <modules>
         <module>testsupport</module>
-		<module>commons</module>
-		<module>metamodel</module>
+        <module>commons</module>
+        <module>metamodel</module>
         <module>progmodel</module>
         <module>runtime</module>
         <module>webapp</module>
-	</modules>
+    </modules>
 
-	<build>
-		<plugins>
+    <build>
+        <plugins>
             <!-- REVIEW -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
 
             <plugin>
                 <groupId>com.agilejava.docbkx</groupId>
                 <artifactId>docbkx-maven-plugin</artifactId>
                 <inherited>false</inherited>
             </plugin>
-		</plugins>
-	</build>
+        </plugins>
+    </build>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>${maven-project-info-reports-plugin}</version>
-				<inherited>false</inherited>
-				<reportSets>
-					<reportSet>
-						<inherited>false</inherited>
-						<reports>
-							<report>dependency-management</report>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>${maven-project-info-reports-plugin}</version>
+                <inherited>false</inherited>
+                <reportSets>
+                    <reportSet>
+                        <inherited>false</inherited>
+                        <reports>
+                            <report>dependency-management</report>
                             <report>plugins</report>
-							<report>modules</report>
+                            <report>modules</report>
                             <report>summary</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 
-	<dependencyManagement>
-		<dependencies>
+    <dependencyManagement>
+        <dependencies>
             <!-- testsupport -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
@@ -120,31 +110,31 @@
                 <type>test-jar</type>
             </dependency>
 
-			<!-- commons -->
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>commons</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>commons</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<type>test-jar</type>
-			</dependency>
-
-			<!-- metamodel -->
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>metamodel</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>metamodel</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<type>test-jar</type>
-			</dependency>
+            <!-- commons -->
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>commons</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>commons</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+                <type>test-jar</type>
+            </dependency>
+
+            <!-- metamodel -->
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>metamodel</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>metamodel</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+                <type>test-jar</type>
+            </dependency>
 
             <!-- progmodel -->
             <dependency>
@@ -159,87 +149,33 @@
                 <type>test-jar</type>
             </dependency>
 
-			<!-- runtime -->
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>runtime</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>runtime</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<type>test-jar</type>
-			</dependency>
-
-			<!-- webapp -->
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>webapp</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.core</groupId>
-				<artifactId>webapp</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<type>test-jar</type>
-			</dependency>
-
-		</dependencies>
-	</dependencyManagement>
-
-    <!-- workaround for http://jira.codehaus.org/browse/MJAVADOC-298;
-    disabled at core, and re-enabled in all submodules except for testsupport -->
-    <profiles>
-        <profile>
-            <id>site-full</id>
-            <activation>
-                <property>
-                    <name>site</name>
-                    <value>full</value>
-                </property>
-            </activation>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <!-- does not seem to work, more's the pity -->
-                            <aggregate>true</aggregate>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    </profiles>
+            <!-- runtime -->
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>runtime</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>runtime</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+                <type>test-jar</type>
+            </dependency>
+
+            <!-- webapp -->
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>webapp</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.core</groupId>
+                <artifactId>webapp</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+                <type>test-jar</type>
+            </dependency>
 
+        </dependencies>
+    </dependencyManagement>
 
 </project>

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/progmodel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/progmodel/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/progmodel/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/progmodel/pom.xml Sun Jun 12 09:32:21 2011
@@ -1,38 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>core</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.isis.core</groupId>
-	<artifactId>progmodel</artifactId>
-	<name>Core ProgModel</name>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.isis</groupId>
+        <artifactId>core</artifactId>
+        <version>0.1.2-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.isis.core</groupId>
+    <artifactId>progmodel</artifactId>
+    <name>Core ProgModel</name>
 
-	<properties>
+    <properties>
         <siteBaseDir>../..</siteBaseDir>
-		<relativeUrl>core/progmodel/</relativeUrl>
+        <relativeUrl>core/progmodel/</relativeUrl>
     </properties>
 
     <!-- used in Site generation for relative references. -->
@@ -43,10 +36,10 @@
             <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>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -63,27 +56,27 @@
         </plugins>
     </reporting>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis</groupId>
-			<artifactId>applib</artifactId>
-        </dependency>
-		<dependency>
-		    <groupId>org.apache.isis</groupId>
-		    <artifactId>applib</artifactId>
-		    <type>test-jar</type>
-		    <scope>test</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>commons</artifactId>
-		    <type>test-jar</type>
-		    <scope>test</scope>
-        </dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>metamodel</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.isis</groupId>
+            <artifactId>applib</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis</groupId>
+            <artifactId>applib</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>commons</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>metamodel</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.isis.core</groupId>
@@ -92,62 +85,11 @@
             <scope>test</scope>
         </dependency>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>testsupport</artifactId>
-		    <scope>test</scope>
-        </dependency>
-	</dependencies>
-
-    <!-- workaround for http://jira.codehaus.org/browse/MJAVADOC-298;
-    disabled at core, and re-enabled in all submodules except for testsupport -->
-    <profiles>
-        <profile>
-            <id>site-full</id>
-            <activation>
-                <property>
-                    <name>site</name>
-                    <value>full</value>
-                </property>
-            </activation>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    </profiles>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>testsupport</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 </project>

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/runtime/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/runtime/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/runtime/pom.xml Sun Jun 12 09:32:21 2011
@@ -1,38 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>core</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.isis.core</groupId>
-	<artifactId>runtime</artifactId>
-	<name>Core Runtime</name>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.isis</groupId>
+        <artifactId>core</artifactId>
+        <version>0.1.2-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.isis.core</groupId>
+    <artifactId>runtime</artifactId>
+    <name>Core Runtime</name>
 
-	<properties>
+    <properties>
         <siteBaseDir>../..</siteBaseDir>
-		<relativeUrl>core/runtime/</relativeUrl>
+        <relativeUrl>core/runtime/</relativeUrl>
     </properties>
 
     <!-- used in Site generation for relative references. -->
@@ -43,10 +36,10 @@
             <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>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -63,83 +56,32 @@
         </plugins>
     </reporting>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>metamodel</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>metamodel</artifactId>
         </dependency>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>testsupport</artifactId>
-		    <scope>test</scope>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>testsupport</artifactId>
+            <scope>test</scope>
         </dependency>
 
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
 
         <!-- to resolve log4j's optional dependency on javax.mail:mail:1.4 -->
         <dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
 
-	</dependencies>
-
-    <!-- workaround for http://jira.codehaus.org/browse/MJAVADOC-298;
-    disabled at core, and re-enabled in all submodules except for testsupport -->
-    <profiles>
-        <profile>
-            <id>site-full</id>
-            <activation>
-                <property>
-                    <name>site</name>
-                    <value>full</value>
-                </property>
-            </activation>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    </profiles>
+    </dependencies>
 
 
 </project>

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/webapp/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/webapp/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/core/webapp/pom.xml Sun Jun 12 09:32:21 2011
@@ -1,74 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>core</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.isis.core</groupId>
-	<artifactId>webapp</artifactId>
-	<name>Core Webapp</name>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.isis</groupId>
+        <artifactId>core</artifactId>
+        <version>0.1.2-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.isis.core</groupId>
+    <artifactId>webapp</artifactId>
+    <name>Core Webapp</name>
 
-	<properties>
+    <properties>
         <siteBaseDir>../..</siteBaseDir>
-		<relativeUrl>core/webapp/</relativeUrl>
+        <relativeUrl>core/webapp/</relativeUrl>
     </properties>
 
     <!-- used in Site generation for relative references. -->
     <url>http://incubator.apache.org/isis/${relativeUrl}</url>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<configuration>
-					<wtpversion>2.0</wtpversion>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-			</plugin>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <configuration>
+                    <wtpversion>2.0</wtpversion>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
 
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
             </plugin>
-		</plugins>
-	</build>
+        </plugins>
+    </build>
 
     <reporting>
         <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>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -85,75 +78,24 @@
         </plugins>
     </reporting>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>runtime</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>runtime</artifactId>
         </dependency>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>testsupport</artifactId>
-		    <scope>test</scope>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>testsupport</artifactId>
+            <scope>test</scope>
         </dependency>
 
-	    <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-	</dependencies>
-
-    <!-- workaround for http://jira.codehaus.org/browse/MJAVADOC-298;
-    disabled at core, and re-enabled in all submodules except for testsupport -->
-    <profiles>
-        <profile>
-            <id>site-full</id>
-            <activation>
-                <property>
-                    <name>site</name>
-                    <value>full</value>
-                </property>
-            </activation>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    </profiles>
+    </dependencies>
 
 
 </project>

Added: incubator/isis/branches/0.1.2-RC4-incubating/trunk/modules
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/modules?rev=1134892&view=auto
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/modules (added)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/modules Sun Jun 12 09:32:21 2011
@@ -0,0 +1,71 @@
+./:
+applib/:leaf
+core/commons/:leaf
+core/metamodel/:leaf
+core/:
+core/progmodel/:leaf
+core/runtime/:leaf
+core/testsupport/:leaf
+core/webapp/:leaf
+progmodels/:
+progmodels/dflt/:
+progmodels/groovy/applib/:leaf
+progmodels/groovy/metamodel/:leaf
+progmodels/groovy/:
+progmodels/wrapper/:
+progmodels/wrapper/applib/:leaf
+progmodels/wrapper/metamodel/:leaf
+runtimes/:
+runtimes/dflt/:
+runtimes/dflt/bytecode/:
+runtimes/dflt/bytecode/dflt/:leaf
+runtimes/dflt/bytecode/identity/:leaf
+runtimes/dflt/bytecode/javassist/:leaf
+runtimes/dflt/monitoring/:leaf
+runtimes/dflt/objectstores/:
+runtimes/dflt/objectstores/dflt/:leaf
+runtimes/dflt/objectstores/nosql/:leaf
+runtimes/dflt/objectstores/sql/:
+runtimes/dflt/objectstores/sql/impl/:leaf
+runtimes/dflt/objectstores/sql/tests-common/:leaf
+runtimes/dflt/objectstores/sql/tests-served/:leaf
+runtimes/dflt/objectstores/xml/:leaf
+runtimes/dflt/profilestores/:
+runtimes/dflt/profilestores/dflt/:leaf
+runtimes/dflt/profilestores/xml/:leaf
+runtimes/dflt/remoting/:
+runtimes/dflt/remoting/common/:leaf
+runtimes/dflt/remoting/marshalling-encode/:leaf
+runtimes/dflt/remoting/marshalling-serialize/:leaf
+runtimes/dflt/remoting/marshalling-xstream/:leaf
+runtimes/dflt/remoting/transport-http/:
+runtimes/dflt/remoting/transport-http/client/:leaf
+runtimes/dflt/remoting/transport-http/server/:leaf
+runtimes/dflt/remoting/transport-sockets/:leaf
+runtimes/dflt/runtime/:leaf
+runtimes/dflt/webapp/:leaf
+runtimes/dflt/webserver/:leaf
+runtimes/embedded/:leaf
+security/:
+security/dflt/:leaf
+security/file/:leaf
+security/ldap/:leaf
+viewer/:
+viewer/bdd/:
+viewer/bdd/common/:leaf
+viewer/bdd/concordion/:leaf
+viewer/dnd/:leaf
+viewer/html/:leaf
+viewer/junit/:leaf
+viewer/restful/:
+viewer/restful/applib/:leaf
+viewer/restful/viewer/:leaf
+viewer/scimpi/:
+viewer/scimpi/dispatcher/:leaf
+viewer/scimpi/servlet/:leaf
+viewer/wicket/:
+viewer/wicket/applib/:leaf
+viewer/wicket/metamodel/:leaf
+viewer/wicket/model/:leaf
+viewer/wicket/ui/:leaf
+viewer/wicket/viewer/:leaf

Added: incubator/isis/branches/0.1.2-RC4-incubating/trunk/msdf.sh
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/msdf.sh?rev=1134892&view=auto
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/msdf.sh (added)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/msdf.sh Sun Jun 12 09:32:21 2011
@@ -0,0 +1,35 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#         http://www.apache.org/licenses/LICENSE-2.0
+#         
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+echo mvn site-deploy -D modules=site -D deploy=local -D site=full $*
+     mvn site-deploy -D modules=site -D deploy=local -D site=full $*
+root=`pwd`
+for a in `cat modules`
+do
+  echo $a | grep ^# >/dev/null
+  if [ $? -ne 0 ]; then
+    d=`echo $a | cut -d: -f1`
+    n=`echo $a | cut -d: -f2`
+    cd $d
+    pwd
+    if [ "$n" ]; then
+      echo mvn site-deploy -D modules=site -D deploy=local -D patch=$n $*
+           mvn site-deploy -D modules=site -D deploy=local -D patch=$n $*
+      fi
+  fi
+  cd $root
+done

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/pom.xml Sun Jun 12 09:32:21 2011
@@ -404,8 +404,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.8</version>
                     <inherited>true</inherited>
                     <configuration>
+                        <debug>true</debug>
+                        <minmemory>128m</minmemory>      
+                        <maxmemory>1024m</maxmemory>
                         <quiet>true</quiet>
                         <doctitle>${project.name} ${project.version}</doctitle>
                         <windowtitle>${project.name} ${project.version}</windowtitle>
@@ -1232,51 +1236,30 @@ archetype includes this explicit depende
 
     <profiles>
         <profile>
-            <id>build-full</id>
+            <id>site-full</id>
             <activation>
                 <property>
-                    <name>build</name>
+                    <name>site</name>
                     <value>full</value>
                 </property>
             </activation>
-            <build>
+            <reporting>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <!-- goal:aggregate (for aggregator modules) 
-                                has no binding; binding explicitly -->
-                            <execution>
-                                <id>aggregate-submodules</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>aggregate</goal>
-                                </goals>
-                            </execution>
-                            <!-- goal:jar (for non-aggregator modules) is 
-                                meant to bind to phase:package, but does not seem to; binding explicitly -->
-                            <execution>
-                                <id>attach-jar</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                            <!-- goal:test-jar (for non-aggregator modules) 
-                                binds to phase:package; have chosen not to bind -->
-                        </executions>
+                        <artifactId>maven-project-info-reports-plugin</artifactId>
+                        <version>${maven-project-info-reports-plugin}</version>
                     </plugin>
                 </plugins>
-            </build>
+            </reporting>
         </profile>
 
         <profile>
-            <id>site-full</id>
+            <id>patch-leaf</id>
             <activation>
                 <property>
-                    <name>site</name>
-                    <value>full</value>
+                    <name>patch</name>
+                    <value>leaf</value>
                 </property>
             </activation>
             <reporting>
@@ -1289,10 +1272,48 @@ archetype includes this explicit depende
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-project-info-reports-plugin</artifactId>
-                        <version>${maven-project-info-reports-plugin}</version>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.8</version>
+                        <configuration>
+                            <debug>true</debug>
+                            <minmemory>128m</minmemory>      
+                            <maxmemory>1024m</maxmemory>
+                            <quiet>true</quiet>
+                            <doctitle>${project.name} ${project.version}</doctitle>
+                            <windowtitle>${project.name} ${project.version}</windowtitle>
+                            <testDoctitle>${project.name} ${project.version}
+                                (TEST API)</testDoctitle>
+                            <testWindowtitle>${project.name} ${project.version}
+                                (TEST API)</testWindowtitle>
+                            <splitindex>true</splitindex>
+                            <encoding>${project.build.sourceEncoding}</encoding>
+                            <links>
+                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
+                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
+                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+                            </links>
+                            <linksource>true</linksource>
+                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
+                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
+                            <detectOfflineLinks>false</detectOfflineLinks>
+                            <!-- default value is as given; referenced by 
+                                other plugins so specified explicitly -->
+                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
+                        </configuration>
+                        <reportSets>
+                            <reportSet>
+                                <reports>
+                                    <report>javadoc</report>
+                                    <!--
+                                    removed because hitting bug 
+                                    (http://jira.codehaus.org/browse/MJAVADOC-298) 
+                                    <report>test-javadoc</report>
+                                    -->
+                                </reports>
+                            </reportSet>
+                        </reportSets>
                     </plugin>
-
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>cobertura-maven-plugin</artifactId>
@@ -1389,60 +1410,9 @@ archetype includes this explicit depende
                         </configuration>
                     </plugin>
 
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <configuration>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <testDoctitle>${project.name}${project.version}
-                                (TEST API)</testDoctitle>
-                            <testWindowtitle>${project.name}${project.version}
-                                (TEST API)</testWindowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                    <!--
-                                    removed because hitting bug 
-                                    (http://jira.codehaus.org/browse/MJAVADOC-298) 
-                                    <report>test-javadoc</report>
-                                    -->
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-
                     <!-- TO LOOK INTO <plugin> <groupId>org.codehaus.sonar</groupId> 
                         <artifactId>sonar-maven-plugin</artifactId> <version>1.10.1</version> </plugin> -->
 
-                    <!-- TO LOOK INTO <plugin> <groupId>org.apache.maven.plugins</groupId> 
-                        <artifactId>maven-changelog-plugin</artifactId> <reportSets> <reportSet> 
-                        <id>dual-report</id> <configuration> <type>range</type> <range>10</range> 
-                        </configuration> <reports> <report>changelog</report> <report>file-activity</report> 
-                        </reports> </reportSet> </reportSets> </plugin> -->
-
-                    <!-- TO LOOK INTO <plugin> <groupId>org.apache.maven.plugins</groupId> 
-                        <artifactId>maven-changes-plugin</artifactId> <configuration> <query>status=accepted&amp;status=assigned&amp;status=new&amp;status=reopened&amp;order=priority</query> 
-                        </configuration> </plugin> -->
                 </plugins>
             </reporting>
         </profile>

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/impl/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/impl/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/impl/pom.xml Sun Jun 12 09:32:21 2011
@@ -1,39 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-		<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
-		<artifactId>sql</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>sql-impl</artifactId>
-	<name>Default Runtime SQL ObjectStore Implementation</name>
-
-	<properties>
-		<siteBaseDir>../../../../..</siteBaseDir>
-		<relativeUrl>runtimes/dflt/objectstores/sql/impl/</relativeUrl>
-	</properties>
+        <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+        <artifactId>sql</artifactId>
+        <version>0.1.2-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sql-impl</artifactId>
+    <name>Default Runtime SQL ObjectStore Implementation</name>
+
+    <properties>
+        <siteBaseDir>../../../../..</siteBaseDir>
+        <relativeUrl>runtimes/dflt/objectstores/sql/impl/</relativeUrl>
+    </properties>
 
     <!-- used in Site generation for relative references. -->
     <url>http://incubator.apache.org/isis/${relativeUrl}</url>
@@ -43,10 +35,10 @@
             <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>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -63,62 +55,11 @@
         </plugins>
     </reporting>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.runtimes.dflt</groupId>
-			<artifactId>runtime</artifactId>
-		</dependency>
-	</dependencies>
-
-    <!-- workaround for http://jira.codehaus.org/browse/MJAVADOC-298;
-    disabled at core, and re-enabled only in the impl submodule -->
-    <profiles>
-        <profile>
-            <id>site-full</id>
-            <activation>
-                <property>
-                    <name>site</name>
-                    <value>full</value>
-                </property>
-            </activation>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    </profiles>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt</groupId>
+            <artifactId>runtime</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>

Modified: incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/pom.xml?rev=1134892&r1=1134891&r2=1134892&view=diff
==============================================================================
--- incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/pom.xml (original)
+++ incubator/isis/branches/0.1.2-RC4-incubating/trunk/runtimes/dflt/objectstores/sql/pom.xml Sun Jun 12 09:32:21 2011
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -41,7 +33,7 @@
 
     <properties>
         <siteBaseDir>../../../..</siteBaseDir>
-		<relativeUrl>runtimes/dflt/objectstores/sql/</relativeUrl>
+        <relativeUrl>runtimes/dflt/objectstores/sql/</relativeUrl>
 
         <docbkxGuideTitle>Apache Isis Default Runtime SQL ObjectStore</docbkxGuideTitle>
         <docbkxGuideSubTitle>Configuration and Deployment Guide</docbkxGuideSubTitle>
@@ -66,7 +58,7 @@
             <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>
                 <reportSets>
                     <reportSet>
@@ -84,78 +76,27 @@
     </reporting>
 
 
-	<profiles>
-		<profile>
-			<id>normal</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>impl</module>
-				<module>tests-common</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>integration-tests</id>
-			<modules>
-				<module>impl</module>
-				<module>tests-common</module>
-				<module>tests-served</module>
-			</modules>
-		</profile>
-
-        <!-- workaround for http://jira.codehaus.org/browse/MJAVADOC-298;
-        disabled at core, and re-enabled only in the impl submodule -->
+    <profiles>
         <profile>
-            <id>site-full</id>
+            <id>normal</id>
             <activation>
-                <property>
-                    <name>site</name>
-                    <value>full</value>
-                </property>
+                <activeByDefault>true</activeByDefault>
             </activation>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <!-- does not seem to work, more's the pity -->
-                            <aggregate>true</aggregate>
-                            <quiet>true</quiet>
-                            <doctitle>${project.name} ${project.version}</doctitle>
-                            <windowtitle>${project.name}${project.version}</windowtitle>
-                            <splitindex>true</splitindex>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.6.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                                <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
-                                <link>http://java.sun.com/j2ee/1.4/docs/api</link>
-                            </links>
-                            <linksource>true</linksource>
-                            <!-- http://jira.codehaus.org/browse/MJAVADOC-268 
-                                and http://jira.codehaus.org/browse/MJAVADOC-284 -->
-                            <detectOfflineLinks>false</detectOfflineLinks>
-                            <!-- default value is as given; referenced by 
-                                other plugins so specified explicitly -->
-                            <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
+            <modules>
+                <module>impl</module>
+                <module>tests-common</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>integration-tests</id>
+            <modules>
+                <module>impl</module>
+                <module>tests-common</module>
+                <module>tests-served</module>
+            </modules>
         </profile>
 
-	</profiles>
+    </profiles>
 
     <dependencyManagement>
         <dependencies>



Mime
View raw message