incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1102717 [12/12] - in /incubator/isis/trunk: ./ applib/ core/ core/commons/ core/metamodel/ core/progmodel/ core/runtime/ core/testsupport/ core/webapp/ domain-libs/ domain-libs/email-service/ examples/ examples/claims/ examples/claims/dom/...
Date Fri, 13 May 2011 13:31:53 GMT
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/pom.xml Fri May 13 13:31:49 2011
@@ -1,83 +1,102 @@
-<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.viewer</groupId>
-	    <artifactId>scimpi</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>scimpi-dispatcher</artifactId>
-
-	<name>Scimpi Viewer Dispatcher</name>
-
-	<properties>
-        <siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/scimpi/dispatcher/</relativeUrl>
-	</properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
+<?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.viewer</groupId>
+	    <artifactId>scimpi</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>scimpi-dispatcher</artifactId>
+
+	<name>Scimpi Viewer Dispatcher</name>
+
+	<properties>
+        <siteBaseDir>../../..</siteBaseDir>
+		<relativeUrl>viewer/scimpi/dispatcher/</relativeUrl>
+	</properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+    <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>
-                <configuration>
-                	<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                </configuration>
-                <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>progmodel</artifactId>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.isis.core</groupId>
-		    <artifactId>runtime</artifactId>
-		</dependency>
-
-        <!-- TODO: remove this dependency -->
-		<dependency>
-			<groupId>org.apache.isis.runtimes.dflt</groupId>
-			<artifactId>runtime</artifactId>
-		</dependency>
-
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20090211</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.htmlparser</groupId>
-            <artifactId>htmlparser</artifactId>
-        </dependency>
-        <dependency>
-        <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
-            <version>2.0_rc9</version>
-        </dependency>
-            
-	</dependencies>
-</project>
+                <inherited>false</inherited>
+                <configuration>
+                	<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+                <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>progmodel</artifactId>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.isis.core</groupId>
+		    <artifactId>runtime</artifactId>
+		</dependency>
+
+        <!-- TODO: remove this dependency -->
+		<dependency>
+			<groupId>org.apache.isis.runtimes.dflt</groupId>
+			<artifactId>runtime</artifactId>
+		</dependency>
+
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20090211</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.htmlparser</groupId>
+            <artifactId>htmlparser</artifactId>
+        </dependency>
+        <dependency>
+        <groupId>org.owasp.esapi</groupId>
+            <artifactId>esapi</artifactId>
+            <version>2.0_rc9</version>
+        </dependency>
+            
+	</dependencies>
+</project>

Modified: incubator/isis/trunk/viewer/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/pom.xml Fri May 13 13:31:49 2011
@@ -1,98 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>viewer</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.isis.viewer</groupId>
-	<artifactId>scimpi</artifactId>
-	<version>0.1.2-incubating-SNAPSHOT</version>
-	
-	<name>Scimpi Viewer</name>
-	
-	<packaging>pom</packaging>
-
-	<properties>
-        <siteBaseDir>../..</siteBaseDir>
-		<relativeUrl>viewer/scimpi/</relativeUrl>
-
-		<docbkxGuideTitle>Apache Isis Scimpi</docbkxGuideTitle>
-        <docbkxGuideSubTitle>Customization, Configuration and Deployment Guide</docbkxGuideSubTitle>
-		<docbkxGuideName>isis-scimpi-viewer</docbkxGuideName>
-    </properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-	<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>
+<!--
+  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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis</groupId>
+		<artifactId>viewer</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.isis.viewer</groupId>
+	<artifactId>scimpi</artifactId>
+	<version>0.1.2-incubating-SNAPSHOT</version>
+	
+	<name>Scimpi Viewer</name>
+	
+	<packaging>pom</packaging>
+
+	<properties>
+        <siteBaseDir>../..</siteBaseDir>
+		<relativeUrl>viewer/scimpi/</relativeUrl>
+
+		<docbkxGuideTitle>Apache Isis Scimpi</docbkxGuideTitle>
+        <docbkxGuideSubTitle>Customization, Configuration and Deployment Guide</docbkxGuideSubTitle>
+		<docbkxGuideName>isis-scimpi-viewer</docbkxGuideName>
+    </properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+	<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>
 				<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>summary</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- TODO: remove this dependency -->
-            <dependency>
-                <groupId>org.apache.isis.runtimes</groupId>
-                <artifactId>dflt</artifactId>
-                <version>0.1.2-incubating-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-	        <dependency>
-	            <groupId>org.apache.isis.viewer</groupId>
-	            <artifactId>scimpi-dispatcher</artifactId>
-	            <version>0.1.2-incubating-SNAPSHOT</version>
-	        </dependency>
-
-	        <dependency>
-	            <groupId>org.apache.isis.viewer</groupId>
-	            <artifactId>scimpi-servlet</artifactId>
-	            <version>0.1.2-incubating-SNAPSHOT</version>
-	        </dependency>
-
-	        <dependency>
-	            <groupId>org.htmlparser</groupId>
-	            <artifactId>htmlparser</artifactId>
-	            <version>1.6</version>
-	        </dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<modules>
-		<module>dispatcher</module>
-		<module>servlet</module>
-	</modules>
-</project>
+                <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>
+            <!-- TODO: remove this dependency -->
+            <dependency>
+                <groupId>org.apache.isis.runtimes</groupId>
+                <artifactId>dflt</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+	        <dependency>
+	            <groupId>org.apache.isis.viewer</groupId>
+	            <artifactId>scimpi-dispatcher</artifactId>
+	            <version>0.1.2-incubating-SNAPSHOT</version>
+	        </dependency>
+
+	        <dependency>
+	            <groupId>org.apache.isis.viewer</groupId>
+	            <artifactId>scimpi-servlet</artifactId>
+	            <version>0.1.2-incubating-SNAPSHOT</version>
+	        </dependency>
+
+	        <dependency>
+	            <groupId>org.htmlparser</groupId>
+	            <artifactId>htmlparser</artifactId>
+	            <version>1.6</version>
+	        </dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<modules>
+		<module>dispatcher</module>
+		<module>servlet</module>
+	</modules>
+</project>

Modified: incubator/isis/trunk/viewer/scimpi/servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/servlet/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/servlet/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/servlet/pom.xml Fri May 13 13:31:49 2011
@@ -1,60 +1,79 @@
-<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.viewer</groupId>
-	    <artifactId>scimpi</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.isis.viewer</groupId>
-	<artifactId>scimpi-servlet</artifactId>
-
-	<name>Scimpi Viewer Servlet</name>
-
-	<properties>
-        <siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/scimpi/servlet/</relativeUrl>
-	</properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-    <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>
-                <configuration>
-                	<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                </configuration>
-                <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.viewer</groupId>
-			<artifactId>scimpi-dispatcher</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-	</dependencies>
-</project>
+<?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.viewer</groupId>
+	    <artifactId>scimpi</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.isis.viewer</groupId>
+	<artifactId>scimpi-servlet</artifactId>
+
+	<name>Scimpi Viewer Servlet</name>
+
+	<properties>
+        <siteBaseDir>../../..</siteBaseDir>
+		<relativeUrl>viewer/scimpi/servlet/</relativeUrl>
+	</properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+    <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>
+                <configuration>
+                	<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+                <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.viewer</groupId>
+			<artifactId>scimpi-dispatcher</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+	</dependencies>
+</project>

Modified: incubator/isis/trunk/viewer/wicket/applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/applib/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/applib/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/applib/pom.xml Fri May 13 13:31:49 2011
@@ -1,27 +1,46 @@
-<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.viewer</groupId>
-		<artifactId>wicket</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>wicket-applib</artifactId>
-	<name>Wicket Viewer AppLib</name>
-
-	<properties>
-		<siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/wicket/applib/</relativeUrl>
-	</properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis</groupId>
-			<artifactId>applib</artifactId>
-		</dependency>
-	</dependencies>
-</project>
+<?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.viewer</groupId>
+		<artifactId>wicket</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>wicket-applib</artifactId>
+	<name>Wicket Viewer AppLib</name>
+
+	<properties>
+		<siteBaseDir>../../..</siteBaseDir>
+		<relativeUrl>viewer/wicket/applib/</relativeUrl>
+	</properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.isis</groupId>
+			<artifactId>applib</artifactId>
+		</dependency>
+	</dependencies>
+</project>

Modified: incubator/isis/trunk/viewer/wicket/metamodel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/metamodel/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/metamodel/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/metamodel/pom.xml Fri May 13 13:31:49 2011
@@ -1,44 +1,63 @@
-<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.viewer</groupId>
-		<artifactId>wicket</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>wicket-metamodel</artifactId>
-	<name>Wicket Viewer MetaModel Support</name>
-
-    <properties>
-		<siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/wicket/metamodel/</relativeUrl>
-	</properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>wicket-applib</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>metamodel</artifactId>
-		</dependency>
-
-		<!-- LOGGING DEPENDENCIES - LOG4J -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-
-	</dependencies>
-
-</project>
+<?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.viewer</groupId>
+		<artifactId>wicket</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>wicket-metamodel</artifactId>
+	<name>Wicket Viewer MetaModel Support</name>
+
+    <properties>
+		<siteBaseDir>../../..</siteBaseDir>
+		<relativeUrl>viewer/wicket/metamodel/</relativeUrl>
+	</properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>wicket-applib</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>metamodel</artifactId>
+		</dependency>
+
+		<!-- LOGGING DEPENDENCIES - LOG4J -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+
+	</dependencies>
+
+</project>

Modified: incubator/isis/trunk/viewer/wicket/model/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/model/pom.xml Fri May 13 13:31:49 2011
@@ -1,70 +1,89 @@
-<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/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis.viewer</groupId>
-		<artifactId>wicket</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>wicket-model</artifactId>
-	<name>Wicket Viewer Model</name>
-
-	<properties>
-		<siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/wicket/model/</relativeUrl>
-	</properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>wicket-metamodel</artifactId>
-		</dependency>
-
-		<dependency>
-		  <groupId>org.apache.wicket</groupId>
-		  <artifactId>wicket</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>commons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>commons</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-
-        <!-- TODO: remove this dependency -->
-		<dependency>
-			<groupId>org.apache.isis.runtimes.dflt</groupId>
-			<artifactId>runtime</artifactId>
-		</dependency>
-
-		<!-- LOGGING DEPENDENCIES - LOG4J -->
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-
-		<!--  jmock class mocking -->
-		<dependency>
-		    <groupId>org.jmock</groupId>
-			<artifactId>jmock-legacy</artifactId>
-		    <scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-</project>
+<?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/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis.viewer</groupId>
+		<artifactId>wicket</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>wicket-model</artifactId>
+	<name>Wicket Viewer Model</name>
+
+	<properties>
+		<siteBaseDir>../../..</siteBaseDir>
+		<relativeUrl>viewer/wicket/model/</relativeUrl>
+	</properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>wicket-metamodel</artifactId>
+		</dependency>
+
+		<dependency>
+		  <groupId>org.apache.wicket</groupId>
+		  <artifactId>wicket</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>commons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>commons</artifactId>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+
+        <!-- TODO: remove this dependency -->
+		<dependency>
+			<groupId>org.apache.isis.runtimes.dflt</groupId>
+			<artifactId>runtime</artifactId>
+		</dependency>
+
+		<!-- LOGGING DEPENDENCIES - LOG4J -->
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+
+		<!--  jmock class mocking -->
+		<dependency>
+		    <groupId>org.jmock</groupId>
+			<artifactId>jmock-legacy</artifactId>
+		    <scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+</project>

Modified: incubator/isis/trunk/viewer/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/pom.xml Fri May 13 13:31:49 2011
@@ -1,225 +1,244 @@
-    <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/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>viewer</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.apache.isis.viewer</groupId>
-	<artifactId>wicket</artifactId>
-	<version>0.1.2-incubating-SNAPSHOT</version>
-
-	<name>Wicket Viewer</name>
-
-	<packaging>pom</packaging>
-
-    <properties>
-        <siteBaseDir>../..</siteBaseDir>
-		<relativeUrl>viewer/wicket/</relativeUrl>
-
-		<wicket.version>1.4.12</wicket.version>
-		<wicketstuff.version>1.4.12</wicketstuff.version>
-
-        <docbkxGuideTitle>Apache Isis Wicket Viewer</docbkxGuideTitle>
-        <docbkxGuideSubTitle>Customization, Configuration and Deployment Guide</docbkxGuideSubTitle>
-        <docbkxGuideName>isis-wicket-viewer</docbkxGuideName>
-    </properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-	<modules>
-		<module>applib</module>
-		<module>model</module>
-		<module>metamodel</module>
-		<module>ui</module>
-		<module>viewer</module>
-	</modules>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.agilejava.docbkx</groupId>
-				<artifactId>docbkx-maven-plugin</artifactId>
-				<inherited>false</inherited>
-			</plugin>
-		</plugins>
-	</build>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- TODO: remove this dependency -->
-            <dependency>
-                <groupId>org.apache.isis.runtimes</groupId>
-                <artifactId>dflt</artifactId>
-                <version>0.1.2-incubating-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-			<!-- Apache Isis Wicket Viewer -->
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-applib</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-applib</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<scope>test</scope>
-				<type>test-jar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-metamodel</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-metamodel</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<scope>test</scope>
-				<type>test-jar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-model</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-model</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<scope>test</scope>
-				<type>test-jar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-ui</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-ui</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<scope>test</scope>
-				<type>test-jar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-viewer</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>wicket-viewer</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-				<scope>test</scope>
-				<type>test-jar</type>
-			</dependency>
-
-			<!-- Apache Isis -->
-			<dependency>
-				<groupId>org.apache.isis</groupId>
-				<artifactId>applib</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>
-			</dependency>
-			<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>
-				<scope>test</scope>
-				<type>test-jar</type>
-			</dependency>
-
-            <!-- TODO: remove this dependency -->            
-			<dependency>
-				<groupId>org.apache.isis.runtimes.dflt</groupId>
-				<artifactId>runtime</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-            <!-- TODO: remove this dependency -->            
-			<dependency>
-				<groupId>org.apache.isis.runtimes.dflt</groupId>
-				<artifactId>webapp</artifactId>
-				<version>0.1.2-incubating-SNAPSHOT</version>
-			</dependency>
-
-
-			<!-- Wicket -->
-			<dependency>
-				<groupId>org.apache.wicket</groupId>
-				<artifactId>wicket</artifactId>
-				<version>${wicket.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.wicket</groupId>
-				<artifactId>wicket-extensions</artifactId>
-				<version>${wicket.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.wicket</groupId>
-				<artifactId>wicket-datetime</artifactId>
-				<version>${wicket.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.wicket</groupId>
-				<artifactId>wicket-auth-roles</artifactId>
-				<version>${wicket.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.wicket</groupId>
-				<artifactId>wicket-guice</artifactId>
-				<version>${wicket.version}</version>
-			</dependency>
-
-            <!-- Wicket & WicketStuff -->
-			<dependency>
-				<groupId>org.wicketstuff</groupId>
-				<artifactId>scriptaculous</artifactId>
-				<version>${wicketstuff.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.wicketstuff</groupId>
-				<artifactId>calendarviews</artifactId>
-				<version>${wicketstuff.version}</version>
-			</dependency>
-
-
-			<!-- Other -->
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.4.2</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jmock</groupId>
-				<artifactId>jmock-legacy</artifactId>
-				<version>2.5.1</version>
-				<scope>test</scope>
-			</dependency>
-
-		</dependencies>
-	</dependencyManagement>
-
-</project>
+<?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/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis</groupId>
+		<artifactId>viewer</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.isis.viewer</groupId>
+	<artifactId>wicket</artifactId>
+	<version>0.1.2-incubating-SNAPSHOT</version>
+
+	<name>Wicket Viewer</name>
+
+	<packaging>pom</packaging>
+
+    <properties>
+        <siteBaseDir>../..</siteBaseDir>
+		<relativeUrl>viewer/wicket/</relativeUrl>
+
+		<wicket.version>1.4.12</wicket.version>
+		<wicketstuff.version>1.4.12</wicketstuff.version>
+
+        <docbkxGuideTitle>Apache Isis Wicket Viewer</docbkxGuideTitle>
+        <docbkxGuideSubTitle>Customization, Configuration and Deployment Guide</docbkxGuideSubTitle>
+        <docbkxGuideName>isis-wicket-viewer</docbkxGuideName>
+    </properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+	<modules>
+		<module>applib</module>
+		<module>model</module>
+		<module>metamodel</module>
+		<module>ui</module>
+		<module>viewer</module>
+	</modules>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.agilejava.docbkx</groupId>
+				<artifactId>docbkx-maven-plugin</artifactId>
+				<inherited>false</inherited>
+			</plugin>
+		</plugins>
+	</build>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- TODO: remove this dependency -->
+            <dependency>
+                <groupId>org.apache.isis.runtimes</groupId>
+                <artifactId>dflt</artifactId>
+                <version>0.1.2-incubating-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+			<!-- Apache Isis Wicket Viewer -->
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-applib</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-applib</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-metamodel</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-metamodel</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-model</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-model</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-ui</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-ui</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-viewer</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.viewer</groupId>
+				<artifactId>wicket-viewer</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+
+			<!-- Apache Isis -->
+			<dependency>
+				<groupId>org.apache.isis</groupId>
+				<artifactId>applib</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>
+			</dependency>
+			<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>
+				<scope>test</scope>
+				<type>test-jar</type>
+			</dependency>
+
+            <!-- TODO: remove this dependency -->            
+			<dependency>
+				<groupId>org.apache.isis.runtimes.dflt</groupId>
+				<artifactId>runtime</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+			</dependency>
+            <!-- TODO: remove this dependency -->            
+			<dependency>
+				<groupId>org.apache.isis.runtimes.dflt</groupId>
+				<artifactId>webapp</artifactId>
+				<version>0.1.2-incubating-SNAPSHOT</version>
+			</dependency>
+
+
+			<!-- Wicket -->
+			<dependency>
+				<groupId>org.apache.wicket</groupId>
+				<artifactId>wicket</artifactId>
+				<version>${wicket.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.wicket</groupId>
+				<artifactId>wicket-extensions</artifactId>
+				<version>${wicket.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.wicket</groupId>
+				<artifactId>wicket-datetime</artifactId>
+				<version>${wicket.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.wicket</groupId>
+				<artifactId>wicket-auth-roles</artifactId>
+				<version>${wicket.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.wicket</groupId>
+				<artifactId>wicket-guice</artifactId>
+				<version>${wicket.version}</version>
+			</dependency>
+
+            <!-- Wicket & WicketStuff -->
+			<dependency>
+				<groupId>org.wicketstuff</groupId>
+				<artifactId>scriptaculous</artifactId>
+				<version>${wicketstuff.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.wicketstuff</groupId>
+				<artifactId>calendarviews</artifactId>
+				<version>${wicketstuff.version}</version>
+			</dependency>
+
+
+			<!-- Other -->
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-log4j12</artifactId>
+				<version>1.4.2</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.jmock</groupId>
+				<artifactId>jmock-legacy</artifactId>
+				<version>2.5.1</version>
+				<scope>test</scope>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
+</project>

Modified: incubator/isis/trunk/viewer/wicket/ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/ui/pom.xml Fri May 13 13:31:49 2011
@@ -1,107 +1,126 @@
-<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/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis.viewer</groupId>
-		<artifactId>wicket</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>wicket-ui</artifactId>
-	<name>Wicket Viewer UI Components</name>
-
-    <properties>
-		<siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/wicket/ui/</relativeUrl>
-	</properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-	<build>
-		<resources>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-	</build>
-
-	<dependencies>
-		<dependency>
-		    <groupId>org.apache.isis.core</groupId>
-		    <artifactId>progmodel</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>wicket-model</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>testsupport</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.wicket</groupId>
-			<artifactId>wicket-extensions</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.wicket</groupId>
-			<artifactId>wicket-datetime</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.wicket</groupId>
-			<artifactId>wicket-auth-roles</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.wicketstuff</groupId>
-			<artifactId>scriptaculous</artifactId>
-		</dependency>
-
-
-		<!-- Dependency Injection support -->
-		<dependency>
-			<groupId>org.apache.wicket</groupId>
-			<artifactId>wicket-guice</artifactId>
-		</dependency>
-
-
-
-		<!-- LOGGING DEPENDENCIES - LOG4J -->
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-
-		<!-- jmock class mocking -->
-		<dependency>
-			<groupId>org.jmock</groupId>
-			<artifactId>jmock-legacy</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-</project>
+<?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/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis.viewer</groupId>
+		<artifactId>wicket</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>wicket-ui</artifactId>
+	<name>Wicket Viewer UI Components</name>
+
+    <properties>
+		<siteBaseDir>../../..</siteBaseDir>
+		<relativeUrl>viewer/wicket/ui/</relativeUrl>
+	</properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+	<build>
+		<resources>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+	</build>
+
+	<dependencies>
+		<dependency>
+		    <groupId>org.apache.isis.core</groupId>
+		    <artifactId>progmodel</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>wicket-model</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>testsupport</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-extensions</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-datetime</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-auth-roles</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.wicketstuff</groupId>
+			<artifactId>scriptaculous</artifactId>
+		</dependency>
+
+
+		<!-- Dependency Injection support -->
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-guice</artifactId>
+		</dependency>
+
+
+
+		<!-- LOGGING DEPENDENCIES - LOG4J -->
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+
+		<!-- jmock class mocking -->
+		<dependency>
+			<groupId>org.jmock</groupId>
+			<artifactId>jmock-legacy</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+</project>

Modified: incubator/isis/trunk/viewer/wicket/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/pom.xml?rev=1102717&r1=1102716&r2=1102717&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/pom.xml Fri May 13 13:31:49 2011
@@ -1,113 +1,132 @@
-<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/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis.viewer</groupId>
-		<artifactId>wicket</artifactId>
-		<version>0.1.2-incubating-SNAPSHOT</version>
-	</parent>
-
-	<name>Wicket Viewer Implementation</name>
-	<artifactId>wicket-viewer</artifactId>
-
-	<properties>
-		<siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/wicket/viewer/</relativeUrl>
-	</properties>
-
-	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
-	<build>
-		<resources>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>wicket-ui</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>testsupport</artifactId>
-			<scope>test</scope>
-		</dependency>
-        
-        <!-- TODO: remove this dependency -->
-		<dependency>
-			<groupId>org.apache.isis.runtimes.dflt</groupId>
-			<artifactId>runtime</artifactId>
-		</dependency>
-
-        <!-- TODO: remove this dependency -->
-		<dependency>
-			<groupId>org.apache.isis.runtimes.dflt</groupId>
-			<artifactId>webapp</artifactId>
-		</dependency>
-
-		<dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.wicket</groupId>
-			<artifactId>wicket-auth-roles</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.wicketstuff</groupId>
-			<artifactId>scriptaculous</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-		</dependency>
-
-
-		<!-- LOGGING DEPENDENCIES - LOG4J -->
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-
-		<!-- jmock class mocking -->
-		<dependency>
-			<groupId>org.jmock</groupId>
-			<artifactId>jmock-legacy</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.inject</groupId>
-			<artifactId>guice-parent</artifactId>
-			<version>2.0</version>
-			<type>pom</type>
-		</dependency>
-
-	</dependencies>
-
-</project>
+<?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/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis.viewer</groupId>
+		<artifactId>wicket</artifactId>
+		<version>0.1.2-incubating-SNAPSHOT</version>
+	</parent>
+
+	<name>Wicket Viewer Implementation</name>
+	<artifactId>wicket-viewer</artifactId>
+
+	<properties>
+		<siteBaseDir>../../..</siteBaseDir>
+		<relativeUrl>viewer/wicket/viewer/</relativeUrl>
+	</properties>
+
+	<url>http://incubator.apache.org/isis/${relativeUrl}</url>
+
+	<build>
+		<resources>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>wicket-ui</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>testsupport</artifactId>
+			<scope>test</scope>
+		</dependency>
+        
+        <!-- TODO: remove this dependency -->
+		<dependency>
+			<groupId>org.apache.isis.runtimes.dflt</groupId>
+			<artifactId>runtime</artifactId>
+		</dependency>
+
+        <!-- TODO: remove this dependency -->
+		<dependency>
+			<groupId>org.apache.isis.runtimes.dflt</groupId>
+			<artifactId>webapp</artifactId>
+		</dependency>
+
+		<dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-auth-roles</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.wicketstuff</groupId>
+			<artifactId>scriptaculous</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+		</dependency>
+
+
+		<!-- LOGGING DEPENDENCIES - LOG4J -->
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+
+		<!-- jmock class mocking -->
+		<dependency>
+			<groupId>org.jmock</groupId>
+			<artifactId>jmock-legacy</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.inject</groupId>
+			<artifactId>guice-parent</artifactId>
+			<version>2.0</version>
+			<type>pom</type>
+		</dependency>
+
+	</dependencies>
+
+</project>



Mime
View raw message