You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/05/23 10:07:07 UTC

[01/19] git commit: ISIS-406: pre-release tidy up, also fix to Firefox rendering

Updated Branches:
  refs/heads/prepare/isis-1.2.0-RC1 a40eaaeb7 -> 6e1da2b67


ISIS-406: pre-release tidy up, also fix to Firefox rendering

* license headers
* RAT exclusions
* fix to Firefox rendering of tables (added a div class='clear')


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/020ec3ea
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/020ec3ea
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/020ec3ea

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 020ec3ea3e91b96d3f573660c49e327d5f37fcc1
Parents: a40eaae
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 06:37:19 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 06:37:19 2013 +0100

----------------------------------------------------------------------
 component/viewer/wicket/pom.xml                    |   23 +++-
 component/viewer/wicket/tck/pom.xml                |    2 +-
 .../CollectionContentsAsAjaxTablePanel.css         |    1 +
 .../CollectionContentsAsAjaxTablePanel.html        |    1 +
 .../isis/viewer/wicket/ui/pages/PageAbstract.css   |    3 -
 .../isis/viewer/wicket/ui/pages/jquery.jgrowl.css  |  117 +++++++++++++++
 .../isisapplib/DateConverterForApplibDateTest.java |   18 +++
 .../DateConverterForApplibDateTimeTest.java        |   18 +++
 .../jdkdates/DateConverterForJavaSqlDateTest.java  |   18 +++
 .../jdkdates/DateConverterForJavaUtilDateTest.java |   18 +++
 .../jodatime/DateConverterForJodaDateTimeTest.java |   18 +++
 .../DateConverterForJodaLocalDateTest.java         |   18 +++
 .../DateConverterForJodaLocalDateTimeTest.java     |   18 +++
 13 files changed, 267 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 3e0aae5..b5d749a 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
 		<relativePath>../../../core/pom.xml</relativePath>
 	</parent>
 
@@ -42,7 +42,6 @@
 
         <wicket.version>6.7.0</wicket.version>
         <wicket-jquery-ui.version>6.7.0</wicket-jquery-ui.version>
-        <wicketstuff.version>6.7.0</wicketstuff.version>
         <wicket-select2.version>2.2.2</wicket-select2.version>
 
         <docbkxGuideTitle>Apache Isis Wicket Viewer</docbkxGuideTitle>
@@ -81,10 +80,30 @@
 	                        <exclude>**/.classpath</exclude>
 	                        <exclude>**/.settings/**</exclude>
                             <exclude>**/*.pdn</exclude>
+                            <exclude>**/*.min.css</exclude>
+                            <exclude>**/wicket-xhtml1.4-strict.dtd</exclude>
                             
                             <!-- not released code, so excluded -->
                             <exclude>jquery-ui/**</exclude>
 	                    </excludes>
+                        <licenses>
+                          <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                            <licenseFamilyCategory>JGROWL</licenseFamilyCategory>
+                            <licenseFamilyName>MIT</licenseFamilyName>
+                            <notes />
+                            <patterns>
+                              <pattern>licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)</pattern>
+                            </patterns>
+                          </license>
+                          <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+                            <licenseFamilyCategory>JQURYUI</licenseFamilyCategory>
+                            <licenseFamilyName>MIT</licenseFamilyName>
+                            <notes />
+                            <patterns>
+                              <pattern>jQuery Foundation and other contributors Licensed MIT</pattern>
+                            </patterns>
+                          </license>
+                      </licenses>
                     </configuration>
 	            </plugin>
 			</plugins>

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 66c1f06..27f7d58 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis-core-tck</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath>../../../../core/tck/pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
index 4fbfe74..dac7744 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
@@ -151,6 +151,7 @@
 
 .collectionContentsAsAjaxTablePanel .actions {
 	margin-top: -1px;
+	margin-bottom: -10px;
     float: left;
     padding:0em 0em;
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
index 0fff9d0..0f6bbf6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
@@ -32,6 +32,7 @@
 	           			</tbody>
 	   			   </table>
 			    </div>
+                <div class="clear"/>
 				<table class="contents" cellspacing="0" wicket:id="table">[table]</table>
 			</div>
 		</wicket:panel>

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
index dd646a1..4850eb9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
@@ -190,9 +190,6 @@ colors
 
 /********** CLASSes **********/
 
-.clear {
-    clear: both;
-}
 
 .feedbackPanel li {
 	list-style: none;	

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.jgrowl.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.jgrowl.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.jgrowl.css
index dbfde23..b603356 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.jgrowl.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.jgrowl.css
@@ -1,3 +1,120 @@
+/**
+ * jGrowl 1.2.10
+ *
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Written by Stan Lemon <st...@gmail.com>
+ * Last updated: 2013.02.14
+ *
+ * jGrowl is a jQuery plugin implementing unobtrusive userland notifications.  These 
+ * notifications function similarly to the Growl Framework available for
+ * Mac OS X (http://growl.info).
+ *
+ * To Do:
+ * - Move library settings to containers and allow them to be changed per container
+ *
+ * Changes in 1.2.10
+ * - Fix beforeClose to be called in click event
+ *
+ * Changes in 1.2.9
+ * - Fixed BC break in jQuery 2.0 beta
+ *
+ * Changes in 1.2.8
+ * - Fixes for jQuery 1.9 and the MSIE6 check, note that with jQuery 2.0 support
+ *   jGrowl intends to drop support for IE6 altogether
+ *
+ * Changes in 1.2.6
+ * - Fixed js error when a notification is opening and closing at the same time
+ * 
+ * Changes in 1.2.5
+ * - Changed wrapper jGrowl's options usage to "o" instead of $.jGrowl.defaults
+ * - Added themeState option to control 'highlight' or 'error' for jQuery UI
+ * - Ammended some CSS to provide default positioning for nested usage.
+ * - Changed some CSS to be prefixed with jGrowl- to prevent namespacing issues
+ * - Added two new options - openDuration and closeDuration to allow 
+ *   better control of notification open and close speeds, respectively 
+ *   Patch contributed by Jesse Vincet.
+ * - Added afterOpen callback.  Patch contributed by Russel Branca.
+ *
+ * Changes in 1.2.4
+ * - Fixed IE bug with the close-all button
+ * - Fixed IE bug with the filter CSS attribute (special thanks to gotwic)
+ * - Update IE opacity CSS
+ * - Changed font sizes to use "em", and only set the base style
+ *
+ * Changes in 1.2.3
+ * - The callbacks no longer use the container as context, instead they use the actual notification
+ * - The callbacks now receive the container as a parameter after the options parameter
+ * - beforeOpen and beforeClose now check the return value, if it's false - the notification does
+ *   not continue.  The open callback will also halt execution if it returns false.
+ * - Fixed bug where containers would get confused
+ * - Expanded the pause functionality to pause an entire container.
+ *
+ * Changes in 1.2.2
+ * - Notification can now be theme rolled for jQuery UI, special thanks to Jeff Chan!
+ *
+ * Changes in 1.2.1
+ * - Fixed instance where the interval would fire the close method multiple times.
+ * - Added CSS to hide from print media
+ * - Fixed issue with closer button when div { position: relative } is set
+ * - Fixed leaking issue with multiple containers.  Special thanks to Matthew Hanlon!
+ *
+ * Changes in 1.2.0
+ * - Added message pooling to limit the number of messages appearing at a given time.
+ * - Closing a notification is now bound to the notification object and triggered by the close button.
+ *
+ * Changes in 1.1.2
+ * - Added iPhone styled example
+ * - Fixed possible IE7 bug when determining if the ie6 class shoudl be applied.
+ * - Added template for the close button, so that it's content could be customized.
+ *
+ * Changes in 1.1.1
+ * - Fixed CSS styling bug for ie6 caused by a mispelling
+ * - Changes height restriction on default notifications to min-height
+ * - Added skinned examples using a variety of images
+ * - Added the ability to customize the content of the [close all] box
+ * - Added jTweet, an example of using jGrowl + Twitter
+ *
+ * Changes in 1.1.0
+ * - Multiple container and instances.
+ * - Standard $.jGrowl() now wraps $.fn.jGrowl() by first establishing a generic jGrowl container.
+ * - Instance methods of a jGrowl container can be called by $.fn.jGrowl(methodName)
+ * - Added glue preferenced, which allows notifications to be inserted before or after nodes in the container
+ * - Added new log callback which is called before anything is done for the notification
+ * - Corner's attribute are now applied on an individual notification basis.
+ *
+ * Changes in 1.0.4
+ * - Various CSS fixes so that jGrowl renders correctly in IE6.
+ *
+ * Changes in 1.0.3
+ * - Fixed bug with options persisting across notifications
+ * - Fixed theme application bug
+ * - Simplified some selectors and manipulations.
+ * - Added beforeOpen and beforeClose callbacks
+ * - Reorganized some lines of code to be more readable
+ * - Removed unnecessary this.defaults context
+ * - If corners plugin is present, it's now customizable.
+ * - Customizable open animation.
+ * - Customizable close animation.
+ * - Customizable animation easing.
+ * - Added customizable positioning (top-left, top-right, bottom-left, bottom-right, center)
+ *
+ * Changes in 1.0.2
+ * - All CSS styling is now external.
+ * - Added a theme parameter which specifies a secondary class for styling, such
+ *   that notifications can be customized in appearance on a per message basis.
+ * - Notification life span is now customizable on a per message basis.
+ * - Added the ability to disable the global closer, enabled by default.
+ * - Added callbacks for when a notification is opened or closed.
+ * - Added callback for the global closer.
+ * - Customizable animation speed.
+ * - jGrowl now set itself up and tears itself down.
+ *
+ * Changes in 1.0.1:
+ * - Removed dependency on metadata plugin in favor of .data()
+ * - Namespaced all events
+ */
 
 div.jGrowl {
 	z-index: 			9999;

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTest.java
index cd82de3..dc84f41 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTest.java
@@ -1,3 +1,21 @@
+/*
+ *  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.
+ */
 package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
 
 import static org.hamcrest.CoreMatchers.is;

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTimeTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTimeTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTimeTest.java
index 9f3940c..1b8af62 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTimeTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/DateConverterForApplibDateTimeTest.java
@@ -1,3 +1,21 @@
+/*
+ *  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.
+ */
 package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
 
 import static org.hamcrest.CoreMatchers.is;

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
index 52d8dbc..59ecf62 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
@@ -1,3 +1,21 @@
+/*
+ *  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.
+ */
 package org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates;
 
 import static org.hamcrest.CoreMatchers.is;

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
index 3eec493..e84ef97 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
@@ -1,3 +1,21 @@
+/*
+ *  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.
+ */
 package org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates;
 
 import static org.hamcrest.CoreMatchers.is;

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
index 8c9406f..f98b17c 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
@@ -1,3 +1,21 @@
+/*
+ *  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.
+ */
 package org.apache.isis.viewer.wicket.ui.components.scalars.jodatime;
 
 import static org.hamcrest.CoreMatchers.is;

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
index 39a2bc4..b4d304f 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
@@ -1,3 +1,21 @@
+/*
+ *  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.
+ */
 package org.apache.isis.viewer.wicket.ui.components.scalars.jodatime;
 
 import static org.hamcrest.CoreMatchers.is;

http://git-wip-us.apache.org/repos/asf/isis/blob/020ec3ea/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
index 692e5fa..2686f91 100644
--- a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
@@ -1,3 +1,21 @@
+/*
+ *  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.
+ */
 package org.apache.isis.viewer.wicket.ui.components.scalars.jodatime;
 
 import static org.hamcrest.CoreMatchers.is;


[09/19] git commit: [maven-release-plugin] prepare for next development iteration

Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d26c51d4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d26c51d4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d26c51d4

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: d26c51d436dc7678165f25bf668d8424d2d935d6
Parents: e92c378
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 08:08:18 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 08:08:18 2013 +0100

----------------------------------------------------------------------
 component/objectstore/jdo/jdo-applib/pom.xml      |    2 +-
 component/objectstore/jdo/jdo-datanucleus/pom.xml |    2 +-
 component/objectstore/jdo/jdo-metamodel/pom.xml   |    2 +-
 component/objectstore/jdo/pom.xml                 |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/d26c51d4/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 744e24d..e1affe7 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-applib</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/d26c51d4/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index 7a25b6d..364d4b5 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-datanucleus</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/d26c51d4/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index 8e2ce72..9c8dc57 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-metamodel</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/d26c51d4/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index f0afd65..e26771b 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
 
 	<groupId>org.apache.isis.objectstore</groupId>
 	<artifactId>isis-objectstore-jdo</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 
 	<name>Isis JDO ObjectStore</name>
 


[17/19] git commit: ISIS-406: bumping reference to isis 1.2.0

Posted by da...@apache.org.
ISIS-406: bumping reference to isis 1.2.0


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5ed748b8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5ed748b8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5ed748b8

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 5ed748b80c7d1b2d4d713e5e482170db470e3bf1
Parents: ebf7023
Author: Dan Haywood <da...@apache.org>
Authored: Thu May 23 08:32:39 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu May 23 08:32:39 2013 +0100

----------------------------------------------------------------------
 component/security/file/pom.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/5ed748b8/component/security/file/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/file/pom.xml b/component/security/file/pom.xml
index 1306832..1baea9b 100644
--- a/component/security/file/pom.xml
+++ b/component/security/file/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
 		<relativePath>../../../core/pom.xml</relativePath>
 	</parent>
 


[16/19] git commit: [maven-release-plugin] prepare for next development iteration

Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ebf7023f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ebf7023f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ebf7023f

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: ebf7023f818f07ef1d42a7031e52f32adc7c4837
Parents: df5f9a3
Author: Dan Haywood <da...@apache.org>
Authored: Thu May 23 08:26:45 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu May 23 08:26:45 2013 +0100

----------------------------------------------------------------------
 component/security/shiro/pom.xml |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/ebf7023f/component/security/shiro/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/shiro/pom.xml b/component/security/shiro/pom.xml
index 8e7ec0a..29935f3 100644
--- a/component/security/shiro/pom.xml
+++ b/component/security/shiro/pom.xml
@@ -29,7 +29,7 @@
 
 	<groupId>org.apache.isis.security</groupId>
 	<artifactId>isis-security-shiro</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
 
 	<name>Isis Shiro Security</name>
 
@@ -100,7 +100,7 @@
 			<dependency>
 			    <groupId>org.apache.isis.security</groupId>
 			    <artifactId>isis-security-shiro</artifactId>
-				<version>1.1.1</version>
+				<version>1.1.2-SNAPSHOT</version>
 			</dependency>
     	</dependencies>
     </dependencyManagement>
@@ -154,8 +154,4 @@
 
 
 	</dependencies>
-
-  <scm>
-    <tag>isis-security-shiro-1.1.1</tag>
-  </scm>
 </project>


[05/19] git commit: [maven-release-plugin] prepare release isis-viewer-restfulobjects-2.0.0

Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-viewer-restfulobjects-2.0.0


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f6314812
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f6314812
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f6314812

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: f63148128f5081e348ae313da428af41a06df339
Parents: d407a1c
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 07:05:15 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 07:05:15 2013 +0100

----------------------------------------------------------------------
 component/viewer/restfulobjects/applib/pom.xml    |    2 +-
 component/viewer/restfulobjects/pom.xml           |   18 +++++++++------
 component/viewer/restfulobjects/rendering/pom.xml |    2 +-
 component/viewer/restfulobjects/server/pom.xml    |    2 +-
 component/viewer/restfulobjects/tck/pom.xml       |    8 +++++-
 5 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/f6314812/component/viewer/restfulobjects/applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/pom.xml b/component/viewer/restfulobjects/applib/pom.xml
index 678e83a..e99ec37 100644
--- a/component/viewer/restfulobjects/applib/pom.xml
+++ b/component/viewer/restfulobjects/applib/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-restfulobjects</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	
 	<artifactId>isis-viewer-restfulobjects-applib</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/f6314812/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index 6e83055..6404063 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -30,7 +30,7 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>isis-viewer-restfulobjects</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
 
 	<name>Isis RestfulObjects Viewer</name>
 
@@ -119,36 +119,36 @@
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-applib</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
+				<version>2.0.0</version>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-applib</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
+				<version>2.0.0</version>
                 <type>test-jar</type>
                 <scope>test</scope>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
+				<version>2.0.0</version>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
+				<version>2.0.0</version>
                 <type>test-jar</type>
                 <scope>test</scope>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-server</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
+				<version>2.0.0</version>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-server</artifactId>
-				<version>2.0.0-SNAPSHOT</version>
+				<version>2.0.0</version>
                 <type>test-jar</type>
                 <scope>test</scope>
 			</dependency>
@@ -163,4 +163,8 @@
 	    <module>server</module>
 	    <module>tck</module>
     </modules>
+
+  <scm>
+    <tag>isis-viewer-restfulobjects-2.0.0</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/f6314812/component/viewer/restfulobjects/rendering/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/rendering/pom.xml b/component/viewer/restfulobjects/rendering/pom.xml
index 9e5b3e2..bad0e5f 100644
--- a/component/viewer/restfulobjects/rendering/pom.xml
+++ b/component/viewer/restfulobjects/rendering/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-restfulobjects</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 
 	<artifactId>isis-viewer-restfulobjects-rendering</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/f6314812/component/viewer/restfulobjects/server/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/server/pom.xml b/component/viewer/restfulobjects/server/pom.xml
index e424fac..7dec1f2 100644
--- a/component/viewer/restfulobjects/server/pom.xml
+++ b/component/viewer/restfulobjects/server/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-restfulobjects</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 
 	<artifactId>isis-viewer-restfulobjects-server</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/f6314812/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 9bc18ea..7d48765 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.isis.viewer</groupId>
 	<artifactId>isis-viewer-restfulobjects-tck</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
 
 	<name>Isis RestfulObjects Viewer TCK tests</name>
 	
@@ -37,7 +37,7 @@
     <properties>
         <maven.test.skip>true</maven.test.skip>
 
-        <isis-viewer-restfulobjects.version>2.0.0-SNAPSHOT</isis-viewer-restfulobjects.version>
+        <isis-viewer-restfulobjects.version>2.0.0</isis-viewer-restfulobjects.version>
 
 		<siteBaseDir>..</siteBaseDir>
 		<relativeUrl>restfulobjects-tck/</relativeUrl>
@@ -124,4 +124,8 @@
         </dependency>
 
 	</dependencies>
+
+  <scm>
+    <tag>isis-viewer-restfulobjects-2.0.0</tag>
+  </scm>
 </project>


[14/19] git commit: ISIS-406: bumping reference to isis 1.2.0

Posted by da...@apache.org.
ISIS-406: bumping reference to isis 1.2.0


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/13c24dcd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/13c24dcd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/13c24dcd

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 13c24dcd77f7bf7c7678eb40fe7239bc092c7b1a
Parents: 1d6eb4a
Author: Dan Haywood <da...@apache.org>
Authored: Thu May 23 08:22:00 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu May 23 08:22:00 2013 +0100

----------------------------------------------------------------------
 component/security/shiro/pom.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/13c24dcd/component/security/shiro/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/shiro/pom.xml b/component/security/shiro/pom.xml
index a7c8259..c0ae3a0 100644
--- a/component/security/shiro/pom.xml
+++ b/component/security/shiro/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
 		<relativePath>../../../core/pom.xml</relativePath>
 	</parent>
 


[10/19] git commit: ISIS-406: workaround for MRRESOURCES-58

Posted by da...@apache.org.
ISIS-406: workaround for MRRESOURCES-58


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4966aa5d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4966aa5d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4966aa5d

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 4966aa5db49efd5f5c160dcc672ececfc276a036
Parents: d26c51d
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 08:13:38 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 08:13:38 2013 +0100

----------------------------------------------------------------------
 component/objectstore/jdo/pom.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/4966aa5d/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index e26771b..b177f73 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -193,7 +193,7 @@
             <id>apache-release</id>
             <properties>
                 <!-- workaround for http://jira.codehaus.org/browse/MRRESOURCES-58 -->
-                <datanucleus.version>LATEST</datanucleus.version>
+                <datanucleus.version>3.2.2</datanucleus.version>
             </properties>
         </profile>        
     </profiles>


[15/19] git commit: [maven-release-plugin] prepare release isis-security-shiro-1.1.1

Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-security-shiro-1.1.1


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/df5f9a34
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/df5f9a34
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/df5f9a34

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: df5f9a34ca88e834f35efefad919137cf7eaed09
Parents: 13c24dc
Author: Dan Haywood <da...@apache.org>
Authored: Thu May 23 08:26:34 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu May 23 08:26:34 2013 +0100

----------------------------------------------------------------------
 component/security/shiro/pom.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/df5f9a34/component/security/shiro/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/shiro/pom.xml b/component/security/shiro/pom.xml
index c0ae3a0..8e7ec0a 100644
--- a/component/security/shiro/pom.xml
+++ b/component/security/shiro/pom.xml
@@ -29,7 +29,7 @@
 
 	<groupId>org.apache.isis.security</groupId>
 	<artifactId>isis-security-shiro</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
 
 	<name>Isis Shiro Security</name>
 
@@ -100,7 +100,7 @@
 			<dependency>
 			    <groupId>org.apache.isis.security</groupId>
 			    <artifactId>isis-security-shiro</artifactId>
-				<version>1.1.1-SNAPSHOT</version>
+				<version>1.1.1</version>
 			</dependency>
     	</dependencies>
     </dependencyManagement>
@@ -154,4 +154,8 @@
 
 
 	</dependencies>
+
+  <scm>
+    <tag>isis-security-shiro-1.1.1</tag>
+  </scm>
 </project>


[07/19] git commit: ISIS-406: bumping pom references to isis-1.2.0

Posted by da...@apache.org.
ISIS-406: bumping pom references to isis-1.2.0


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9305a843
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9305a843
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9305a843

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 9305a843d6adb65dbb1f65f527c2f8727017a238
Parents: c985e90
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 07:23:18 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 07:23:18 2013 +0100

----------------------------------------------------------------------
 component/objectstore/jdo/pom.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/9305a843/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 85e561f..5a46a42 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
 		<relativePath>../../../core/pom.xml</relativePath>
 	</parent>
 
@@ -76,6 +76,8 @@
 	                        <exclude>**/*.project</exclude>
 	                        <exclude>**/.classpath</exclude>
 	                        <exclude>**/.settings/**</exclude>
+
+	                        <exclude>**/*.log</exclude>
 	                    </excludes>
                     </configuration>
 	            </plugin>


[08/19] git commit: ISIS-406: workaround for MRRESOURCES-58

Posted by da...@apache.org.
ISIS-406: workaround for MRRESOURCES-58


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e92c3786
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e92c3786
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e92c3786

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: e92c3786183bb060fc5346ea6afc83f3321be755
Parents: 9305a84
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 08:05:49 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 08:05:49 2013 +0100

----------------------------------------------------------------------
 component/objectstore/jdo/pom.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/e92c3786/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 5a46a42..f0afd65 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -35,6 +35,8 @@
 		<docbkxGuideTitle>Apache Isis JDO ObjectStore</docbkxGuideTitle>
 		<docbkxGuideSubTitle>Customization, Configuration and Deployment Guide</docbkxGuideSubTitle>
 		<docbkxGuideName>isis-jdo-objectstore</docbkxGuideName>
+        
+        <datanucleus.version>[3.1.99, )</datanucleus.version>
 	</properties>
 
 	<!-- used in Site generation for relative references. -->
@@ -153,17 +155,17 @@
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-core</artifactId>
-                <version>[3.1.99, )</version>
+                <version>${datanucleus.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-api-jdo</artifactId>
-                <version>[3.1.99, )</version>
+                <version>${datanucleus.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-rdbms</artifactId>
-                <version>[3.1.99, )</version>
+                <version>${datanucleus.version}</version>
             </dependency>
 	        <dependency>
 	            <groupId>org.datanucleus</groupId>
@@ -185,4 +187,14 @@
 
 		</dependencies>
 	</dependencyManagement>
+    
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <properties>
+                <!-- workaround for http://jira.codehaus.org/browse/MRRESOURCES-58 -->
+                <datanucleus.version>LATEST</datanucleus.version>
+            </properties>
+        </profile>        
+    </profiles>
 </project>


[03/19] git commit: [maven-release-plugin] prepare for next development iteration

Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d0650f83
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d0650f83
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d0650f83

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: d0650f83cbe76f83f361065012dd25aa5c957914
Parents: be80614
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 06:42:30 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 06:42:30 2013 +0100

----------------------------------------------------------------------
 component/viewer/wicket/impl/pom.xml  |    2 +-
 component/viewer/wicket/model/pom.xml |    2 +-
 component/viewer/wicket/pom.xml       |   18 +++++++-----------
 component/viewer/wicket/tck/pom.xml   |    8 ++------
 component/viewer/wicket/ui/pom.xml    |    2 +-
 5 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/d0650f83/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index 9f5d4e9..a6f2e2a 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-wicket</artifactId>
-        <version>1.2.0</version>
+        <version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<name>Isis Wicket Viewer Implementation</name>

http://git-wip-us.apache.org/repos/asf/isis/blob/d0650f83/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index 37b05a7..1ebd801 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-wicket</artifactId>
-        <version>1.2.0</version>
+        <version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-viewer-wicket-model</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/d0650f83/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index a30e464..c2c5103 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -30,7 +30,7 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>isis-viewer-wicket</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0-SNAPSHOT</version>
 
 	<name>Isis Wicket Viewer</name>
 
@@ -124,36 +124,36 @@
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-model</artifactId>
-				<version>1.2.0</version>
+				<version>1.3.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-model</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-ui</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-ui</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-impl</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-impl</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
@@ -301,8 +301,4 @@
 
 		</dependencies>
 	</dependencyManagement>
-
-  <scm>
-    <tag>isis-viewer-wicket-1.2.0</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/d0650f83/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index faf666a..6482071 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -29,13 +29,13 @@
 
     <groupId>org.apache.isis.viewer</groupId>
 	<artifactId>isis-viewer-wicket-tck</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0-SNAPSHOT</version>
 
 	<name>Isis Wicket Viewer TCK tests</name>
 
 
 	<properties>
-        <isis-viewer-wicket.version>1.2.0</isis-viewer-wicket.version>
+        <isis-viewer-wicket.version>1.3.0-SNAPSHOT</isis-viewer-wicket.version>
 		<jetty.version>6.1.4</jetty.version>
 		<siteBaseDir>..</siteBaseDir>
 		<relativeUrl>wicket-tck/</relativeUrl>
@@ -115,8 +115,4 @@
         </dependency>
 
 	</dependencies>
-
-  <scm>
-    <tag>isis-viewer-wicket-1.2.0</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/d0650f83/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index b184f3c..3601f13 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-wicket</artifactId>
-        <version>1.2.0</version>
+        <version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-viewer-wicket-ui</artifactId>


[18/19] git commit: [maven-release-plugin] prepare release isis-security-file-1.0.1

Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-security-file-1.0.1


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2d7fa329
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2d7fa329
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2d7fa329

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 2d7fa329b7784b4ba71aacb0258f518a3cded95e
Parents: 5ed748b
Author: Dan Haywood <da...@apache.org>
Authored: Thu May 23 08:42:12 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu May 23 08:42:12 2013 +0100

----------------------------------------------------------------------
 component/security/file/pom.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/2d7fa329/component/security/file/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/file/pom.xml b/component/security/file/pom.xml
index 1baea9b..f80eff1 100644
--- a/component/security/file/pom.xml
+++ b/component/security/file/pom.xml
@@ -29,7 +29,7 @@
 
 	<groupId>org.apache.isis.security</groupId>
 	<artifactId>isis-security-file</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
 
 	<name>Isis File Security</name>
 
@@ -99,7 +99,7 @@
 			<dependency>
 			    <groupId>org.apache.isis.security</groupId>
 			    <artifactId>isis-security-file</artifactId>
-				<version>1.0.1-SNAPSHOT</version>
+				<version>1.0.1</version>
 			</dependency>
     	</dependencies>
     </dependencyManagement>
@@ -116,4 +116,8 @@
 		    <scope>test</scope>
 		</dependency>
 	</dependencies>
+
+  <scm>
+    <tag>isis-security-file-1.0.1</tag>
+  </scm>
 </project>


[13/19] git commit: [maven-release-plugin] prepare for next development iteration

Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1d6eb4a8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1d6eb4a8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1d6eb4a8

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 1d6eb4a8ae67cb1a0d5e2cf1c3f42794f8b40035
Parents: 4b41f09
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 08:28:43 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 08:28:43 2013 +0100

----------------------------------------------------------------------
 component/objectstore/jdo/jdo-applib/pom.xml      |    4 +-
 component/objectstore/jdo/jdo-datanucleus/pom.xml |    2 +-
 component/objectstore/jdo/jdo-metamodel/pom.xml   |    2 +-
 component/objectstore/jdo/pom.xml                 |   18 ++++++---------
 4 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/1d6eb4a8/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 9a27ad4..507c736 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-applib</artifactId>
@@ -105,7 +105,7 @@
 			<dependency>
 	            <groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>						
 			</dependency>

http://git-wip-us.apache.org/repos/asf/isis/blob/1d6eb4a8/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index bd9de97..364d4b5 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-datanucleus</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/1d6eb4a8/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index c8c306d..9c8dc57 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-metamodel</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/1d6eb4a8/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 2f3f4d0..8fd1367 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
 
 	<groupId>org.apache.isis.objectstore</groupId>
 	<artifactId>isis-objectstore-jdo</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0-SNAPSHOT</version>
 
 	<name>Isis JDO ObjectStore</name>
 
@@ -101,36 +101,36 @@
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-applib</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-applib</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-metamodel</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-metamodel</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.0-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
@@ -197,8 +197,4 @@
             </properties>
         </profile>        
     </profiles>
-
-  <scm>
-    <tag>isis-objectstore-jdo-1.1.0</tag>
-  </scm>
 </project>


[11/19] git commit: ISIS-406: fixing pom references

Posted by da...@apache.org.
ISIS-406: fixing pom references


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/16d395ac
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/16d395ac
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/16d395ac

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 16d395acf316c882e158bd01bfd2454cc92f762a
Parents: 4966aa5
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 08:21:57 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 08:21:57 2013 +0100

----------------------------------------------------------------------
 component/objectstore/jdo/jdo-applib/pom.xml      |    2 +-
 component/objectstore/jdo/jdo-datanucleus/pom.xml |    2 +-
 component/objectstore/jdo/jdo-metamodel/pom.xml   |    2 +-
 component/objectstore/jdo/pom.xml                 |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/16d395ac/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index e1affe7..744e24d 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-applib</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/16d395ac/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index 364d4b5..7a25b6d 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-datanucleus</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/16d395ac/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index 9c8dc57..8e2ce72 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-metamodel</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/16d395ac/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index b177f73..738ab92 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
 
 	<groupId>org.apache.isis.objectstore</groupId>
 	<artifactId>isis-objectstore-jdo</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
 	<name>Isis JDO ObjectStore</name>
 


[04/19] git commit: ISIS-406: bumping pom references to isis-1.2.0

Posted by da...@apache.org.
ISIS-406: bumping pom references to isis-1.2.0


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d407a1c7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d407a1c7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d407a1c7

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: d407a1c7f01b7b42c22872f183cb5e9443cde94f
Parents: d0650f8
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 07:01:23 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 07:01:23 2013 +0100

----------------------------------------------------------------------
 component/viewer/restfulobjects/pom.xml     |    2 +-
 component/viewer/restfulobjects/tck/pom.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/d407a1c7/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index cdb9e1b..6e83055 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.core</groupId>
 		<artifactId>isis</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
 		<relativePath>../../../core/pom.xml</relativePath>
 	</parent>
 

http://git-wip-us.apache.org/repos/asf/isis/blob/d407a1c7/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 43d9c34..9bc18ea 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis-core-tck</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath>../../../../core/tck/pom.xml</relativePath>
     </parent>
 


[06/19] git commit: [maven-release-plugin] prepare for next development iteration

Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c985e903
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c985e903
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c985e903

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: c985e9033314dba2e68d84340759ee8362861ad1
Parents: f631481
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 07:05:23 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 07:05:23 2013 +0100

----------------------------------------------------------------------
 component/viewer/restfulobjects/applib/pom.xml    |    2 +-
 component/viewer/restfulobjects/pom.xml           |   18 ++++++---------
 component/viewer/restfulobjects/rendering/pom.xml |    2 +-
 component/viewer/restfulobjects/server/pom.xml    |    2 +-
 component/viewer/restfulobjects/tck/pom.xml       |    8 +-----
 5 files changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/c985e903/component/viewer/restfulobjects/applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/applib/pom.xml b/component/viewer/restfulobjects/applib/pom.xml
index e99ec37..8947b4e 100644
--- a/component/viewer/restfulobjects/applib/pom.xml
+++ b/component/viewer/restfulobjects/applib/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-restfulobjects</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>isis-viewer-restfulobjects-applib</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/c985e903/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index 6404063..2b06570 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -30,7 +30,7 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>isis-viewer-restfulobjects</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
 
 	<name>Isis RestfulObjects Viewer</name>
 
@@ -119,36 +119,36 @@
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-applib</artifactId>
-				<version>2.0.0</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-applib</artifactId>
-				<version>2.0.0</version>
+				<version>2.1.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
-				<version>2.0.0</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-rendering</artifactId>
-				<version>2.0.0</version>
+				<version>2.1.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-server</artifactId>
-				<version>2.0.0</version>
+				<version>2.1.0-SNAPSHOT</version>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-restfulobjects-server</artifactId>
-				<version>2.0.0</version>
+				<version>2.1.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
 			</dependency>
@@ -163,8 +163,4 @@
 	    <module>server</module>
 	    <module>tck</module>
     </modules>
-
-  <scm>
-    <tag>isis-viewer-restfulobjects-2.0.0</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/c985e903/component/viewer/restfulobjects/rendering/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/rendering/pom.xml b/component/viewer/restfulobjects/rendering/pom.xml
index bad0e5f..2afa4be 100644
--- a/component/viewer/restfulobjects/rendering/pom.xml
+++ b/component/viewer/restfulobjects/rendering/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-restfulobjects</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-viewer-restfulobjects-rendering</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/c985e903/component/viewer/restfulobjects/server/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/server/pom.xml b/component/viewer/restfulobjects/server/pom.xml
index 7dec1f2..c8fbca3 100644
--- a/component/viewer/restfulobjects/server/pom.xml
+++ b/component/viewer/restfulobjects/server/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-restfulobjects</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>isis-viewer-restfulobjects-server</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/c985e903/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 7d48765..c1fcf09 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.isis.viewer</groupId>
 	<artifactId>isis-viewer-restfulobjects-tck</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0-SNAPSHOT</version>
 
 	<name>Isis RestfulObjects Viewer TCK tests</name>
 	
@@ -37,7 +37,7 @@
     <properties>
         <maven.test.skip>true</maven.test.skip>
 
-        <isis-viewer-restfulobjects.version>2.0.0</isis-viewer-restfulobjects.version>
+        <isis-viewer-restfulobjects.version>2.1.0-SNAPSHOT</isis-viewer-restfulobjects.version>
 
 		<siteBaseDir>..</siteBaseDir>
 		<relativeUrl>restfulobjects-tck/</relativeUrl>
@@ -124,8 +124,4 @@
         </dependency>
 
 	</dependencies>
-
-  <scm>
-    <tag>isis-viewer-restfulobjects-2.0.0</tag>
-  </scm>
 </project>


[19/19] git commit: [maven-release-plugin] prepare for next development iteration

Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6e1da2b6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6e1da2b6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6e1da2b6

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 6e1da2b67121886e058c36689d3e206e37934cc3
Parents: 2d7fa32
Author: Dan Haywood <da...@apache.org>
Authored: Thu May 23 08:42:32 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu May 23 08:42:32 2013 +0100

----------------------------------------------------------------------
 component/security/file/pom.xml |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/6e1da2b6/component/security/file/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/file/pom.xml b/component/security/file/pom.xml
index f80eff1..156f1be 100644
--- a/component/security/file/pom.xml
+++ b/component/security/file/pom.xml
@@ -29,7 +29,7 @@
 
 	<groupId>org.apache.isis.security</groupId>
 	<artifactId>isis-security-file</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
 
 	<name>Isis File Security</name>
 
@@ -99,7 +99,7 @@
 			<dependency>
 			    <groupId>org.apache.isis.security</groupId>
 			    <artifactId>isis-security-file</artifactId>
-				<version>1.0.1</version>
+				<version>1.0.2-SNAPSHOT</version>
 			</dependency>
     	</dependencies>
     </dependencyManagement>
@@ -116,8 +116,4 @@
 		    <scope>test</scope>
 		</dependency>
 	</dependencies>
-
-  <scm>
-    <tag>isis-security-file-1.0.1</tag>
-  </scm>
 </project>


[12/19] git commit: [maven-release-plugin] prepare release isis-objectstore-jdo-1.1.0

Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-objectstore-jdo-1.1.0


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4b41f094
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4b41f094
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4b41f094

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: 4b41f094dc386ed8a68709786d59d2239493aa8b
Parents: 16d395a
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 08:28:38 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 08:28:38 2013 +0100

----------------------------------------------------------------------
 component/objectstore/jdo/jdo-applib/pom.xml      |    4 +-
 component/objectstore/jdo/jdo-datanucleus/pom.xml |    2 +-
 component/objectstore/jdo/jdo-metamodel/pom.xml   |    2 +-
 component/objectstore/jdo/pom.xml                 |   18 +++++++++------
 4 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/4b41f094/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 744e24d..9a27ad4 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-applib</artifactId>
@@ -105,7 +105,7 @@
 			<dependency>
 	            <groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 				<type>pom</type>
 				<scope>import</scope>						
 			</dependency>

http://git-wip-us.apache.org/repos/asf/isis/blob/4b41f094/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index 7a25b6d..bd9de97 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-datanucleus</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/4b41f094/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index 8e2ce72..c8c306d 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.isis.objectstore</groupId>
 		<artifactId>isis-objectstore-jdo</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<artifactId>isis-objectstore-jdo-metamodel</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/4b41f094/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 738ab92..2f3f4d0 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -22,7 +22,7 @@
 
 	<groupId>org.apache.isis.objectstore</groupId>
 	<artifactId>isis-objectstore-jdo</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
 
 	<name>Isis JDO ObjectStore</name>
 
@@ -101,36 +101,36 @@
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-applib</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-applib</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-metamodel</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-metamodel</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.objectstore</groupId>
 				<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
@@ -197,4 +197,8 @@
             </properties>
         </profile>        
     </profiles>
+
+  <scm>
+    <tag>isis-objectstore-jdo-1.1.0</tag>
+  </scm>
 </project>


[02/19] git commit: [maven-release-plugin] prepare release isis-viewer-wicket-1.2.0

Posted by da...@apache.org.
[maven-release-plugin] prepare release isis-viewer-wicket-1.2.0


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/be806148
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/be806148
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/be806148

Branch: refs/heads/prepare/isis-1.2.0-RC1
Commit: be806148cb954555e406fb0733ebb92acb56cc22
Parents: 020ec3e
Author: Dan Haywood <da...@apache.org>
Authored: Wed May 22 06:42:24 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Wed May 22 06:42:24 2013 +0100

----------------------------------------------------------------------
 component/viewer/wicket/impl/pom.xml  |    2 +-
 component/viewer/wicket/model/pom.xml |    2 +-
 component/viewer/wicket/pom.xml       |   18 +++++++++++-------
 component/viewer/wicket/tck/pom.xml   |    8 ++++++--
 component/viewer/wicket/ui/pom.xml    |    2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/be806148/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index e0ba49b..9f5d4e9 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-wicket</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
 	</parent>
 
 	<name>Isis Wicket Viewer Implementation</name>

http://git-wip-us.apache.org/repos/asf/isis/blob/be806148/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index a17b8d5..37b05a7 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-wicket</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
 	</parent>
 
 	<artifactId>isis-viewer-wicket-model</artifactId>

http://git-wip-us.apache.org/repos/asf/isis/blob/be806148/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index b5d749a..a30e464 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -30,7 +30,7 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>isis-viewer-wicket</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
 
 	<name>Isis Wicket Viewer</name>
 
@@ -124,36 +124,36 @@
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-model</artifactId>
-				<version>1.2.0-SNAPSHOT</version>
+				<version>1.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-model</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>1.2.0</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-ui</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>1.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-ui</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>1.2.0</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-impl</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>1.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>isis-viewer-wicket-impl</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>1.2.0</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
@@ -301,4 +301,8 @@
 
 		</dependencies>
 	</dependencyManagement>
+
+  <scm>
+    <tag>isis-viewer-wicket-1.2.0</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/be806148/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 27f7d58..faf666a 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -29,13 +29,13 @@
 
     <groupId>org.apache.isis.viewer</groupId>
 	<artifactId>isis-viewer-wicket-tck</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
 
 	<name>Isis Wicket Viewer TCK tests</name>
 
 
 	<properties>
-        <isis-viewer-wicket.version>1.2.0-SNAPSHOT</isis-viewer-wicket.version>
+        <isis-viewer-wicket.version>1.2.0</isis-viewer-wicket.version>
 		<jetty.version>6.1.4</jetty.version>
 		<siteBaseDir>..</siteBaseDir>
 		<relativeUrl>wicket-tck/</relativeUrl>
@@ -115,4 +115,8 @@
         </dependency>
 
 	</dependencies>
+
+  <scm>
+    <tag>isis-viewer-wicket-1.2.0</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/be806148/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index b76f9ab..b184f3c 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>isis-viewer-wicket</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
 	</parent>
 
 	<artifactId>isis-viewer-wicket-ui</artifactId>