[xwiki-notifications] r5224 - in xwiki-platform/core/trunk: . xwiki-core

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 11:49:33 +0200 (Wed, 03 Oct 2007)
New Revision: 5224

Modified:
   xwiki-platform/core/trunk/pom.xml
   xwiki-platform/core/trunk/xwiki-core/pom.xml
Log:
Prepare for releasing Core 1.2M1.

Modified: xwiki-platform/core/trunk/pom.xml
===
--- xwiki-platform/core/trunk/pom.xml   2007-10-03 09:04:56 UTC (rev 5223)
+++ xwiki-platform/core/trunk/pom.xml   2007-10-03 09:49:33 UTC (rev 5224)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki
-6-SNAPSHOT
+5
 ../xwiki-platform-pom
   
   xwiki-core-parent

Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 09:04:56 UTC 
(rev 5223)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 09:49:33 UTC 
(rev 5224)
@@ -503,7 +503,7 @@
   
 com.xpn.xwiki.platform
 xwiki-build-verifications
-1.7-SNAPSHOT
+1.6
   
 
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5226 - in xwiki-platform/core/trunk: . xwiki-action xwiki-component xwiki-containers xwiki-containers/xwiki-container-api xwiki-containers/xwiki-container-servlet xwiki-core xwi

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 11:58:41 +0200 (Wed, 03 Oct 2007)
New Revision: 5226

Modified:
   xwiki-platform/core/trunk/pom.xml
   xwiki-platform/core/trunk/xwiki-action/pom.xml
   xwiki-platform/core/trunk/xwiki-component/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
   xwiki-platform/core/trunk/xwiki-core/pom.xml
   xwiki-platform/core/trunk/xwiki-observation/pom.xml
   xwiki-platform/core/trunk/xwiki-plexus/pom.xml
   xwiki-platform/core/trunk/xwiki-url/pom.xml
   xwiki-platform/core/trunk/xwiki-velocity/pom.xml
Log:
[maven-release-plugin] prepare release xwiki-core-1.2-milestone-1

Modified: xwiki-platform/core/trunk/pom.xml
===
--- xwiki-platform/core/trunk/pom.xml   2007-10-03 09:58:12 UTC (rev 5225)
+++ xwiki-platform/core/trunk/pom.xml   2007-10-03 09:58:41 UTC (rev 5226)
@@ -33,12 +33,12 @@
   xwiki-core-parent
   XWiki Platform - Core - Parent POM
   pom
-  1.2-SNAPSHOT
+  1.2-milestone-1
   XWiki Platform - Core - Parent POM
   
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/core/trunk
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/core/trunk
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/core/trunk
+
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
+
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
+
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
   
   
 

Modified: xwiki-platform/core/trunk/xwiki-action/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-action/pom.xml  2007-10-03 09:58:12 UTC 
(rev 5225)
+++ xwiki-platform/core/trunk/xwiki-action/pom.xml  2007-10-03 09:58:41 UTC 
(rev 5226)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   org.xwiki.platform
   xwiki-core-action

Modified: xwiki-platform/core/trunk/xwiki-component/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-component/pom.xml   2007-10-03 09:58:12 UTC 
(rev 5225)
+++ xwiki-platform/core/trunk/xwiki-component/pom.xml   2007-10-03 09:58:41 UTC 
(rev 5226)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   org.xwiki.platform
   xwiki-core-component

Modified: xwiki-platform/core/trunk/xwiki-containers/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/pom.xml  2007-10-03 09:58:12 UTC 
(rev 5225)
+++ xwiki-platform/core/trunk/xwiki-containers/pom.xml  2007-10-03 09:58:41 UTC 
(rev 5226)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   org.xwiki.platform
   xwiki-core-containers-parent

Modified: xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml  
2007-10-03 09:58:12 UTC (rev 5225)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml  
2007-10-03 09:58:41 UTC (rev 5226)
@@ -27,7 +27,7 @@
   
 org.xwiki.platform
 xwiki-core-containers-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-core-container-api
   XWiki Platform - Core - Containers - API

Modified: 
xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml  
2007-10-03 09:58:12 UTC (rev 5225)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml  
2007-10-03 09:58:41 UTC (rev 5226)
@@ -27,7 +27,7 @@
   
 org.xwiki.platform
 xwiki-core-containers-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-core-container-servlet
   XWiki Platform - Core - Containers - Servlet

Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 09:58:12 UTC 
(rev 5225)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 09:58:41 UTC 
(rev 5226)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-core
   XWiki Platform - Core - Core

Modified: xwiki-platform/core/trunk/xwiki-observation/pom.xml

[xwiki-notifications] r5225 - in xwiki-platform/web/trunk: . exo gwt standard

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 11:58:12 +0200 (Wed, 03 Oct 2007)
New Revision: 5225

Modified:
   xwiki-platform/web/trunk/exo/pom.xml
   xwiki-platform/web/trunk/gwt/pom.xml
   xwiki-platform/web/trunk/pom.xml
   xwiki-platform/web/trunk/standard/pom.xml
Log:
Prepare for Platform Web 1.2M1 release


Modified: xwiki-platform/web/trunk/exo/pom.xml
===
--- xwiki-platform/web/trunk/exo/pom.xml2007-10-03 09:49:33 UTC (rev 
5224)
+++ xwiki-platform/web/trunk/exo/pom.xml2007-10-03 09:58:12 UTC (rev 
5225)
@@ -74,7 +74,7 @@
 
 
   
-
com.xpn.xwiki.platform:xwiki-configuration-resources:1.7-SNAPSHOT
+
com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}
   
   
 1

Modified: xwiki-platform/web/trunk/gwt/pom.xml
===
--- xwiki-platform/web/trunk/gwt/pom.xml2007-10-03 09:49:33 UTC (rev 
5224)
+++ xwiki-platform/web/trunk/gwt/pom.xml2007-10-03 09:58:12 UTC (rev 
5225)
@@ -36,7 +36,7 @@
 
   com.xpn.xwiki.platform
   xwiki-core
-  1.2-SNAPSHOT
+  ${platform.core.version}
   
   provided

Modified: xwiki-platform/web/trunk/pom.xml
===
--- xwiki-platform/web/trunk/pom.xml2007-10-03 09:49:33 UTC (rev 5224)
+++ xwiki-platform/web/trunk/pom.xml2007-10-03 09:58:12 UTC (rev 5225)
@@ -25,7 +25,7 @@
   
 com.xpn.xwiki.platform
 xwiki
-6-SNAPSHOT
+5
 ../xwiki-platform-pom
   
   xwiki-web
@@ -38,6 +38,11 @@
 
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/web/trunk
 
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/web/trunk
   
+  
+
+1.6
+1.2-milestone-1
+  
   
 
   default

Modified: xwiki-platform/web/trunk/standard/pom.xml
===
--- xwiki-platform/web/trunk/standard/pom.xml   2007-10-03 09:49:33 UTC (rev 
5224)
+++ xwiki-platform/web/trunk/standard/pom.xml   2007-10-03 09:58:12 UTC (rev 
5225)
@@ -13,7 +13,7 @@
 
   com.xpn.xwiki.platform
   xwiki-core
-  1.2-SNAPSHOT
+  ${platform.core.version}
 
 
@@ -25,7 +25,7 @@
 
   org.xwiki.platform
   xwiki-core-plexus
-  1.2-SNAPSHOT
+  ${platform.core.version}
 
   
   
@@ -54,7 +54,7 @@
 
 
   
-
com.xpn.xwiki.platform:xwiki-configuration-resources:1.7-SNAPSHOT
+
com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}
   
   
 none

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5227 - in xwiki-platform/core/trunk: . xwiki-action xwiki-component xwiki-containers xwiki-containers/xwiki-container-api xwiki-containers/xwiki-container-servlet xwiki-core xwi

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 12:05:08 +0200 (Wed, 03 Oct 2007)
New Revision: 5227

Modified:
   xwiki-platform/core/trunk/pom.xml
   xwiki-platform/core/trunk/xwiki-action/pom.xml
   xwiki-platform/core/trunk/xwiki-component/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
   xwiki-platform/core/trunk/xwiki-core/pom.xml
   xwiki-platform/core/trunk/xwiki-observation/pom.xml
   xwiki-platform/core/trunk/xwiki-plexus/pom.xml
   xwiki-platform/core/trunk/xwiki-url/pom.xml
   xwiki-platform/core/trunk/xwiki-velocity/pom.xml
Log:
[maven-release-plugin] rollback the release of xwiki-core-1.2-milestone-1

Modified: xwiki-platform/core/trunk/pom.xml
===
--- xwiki-platform/core/trunk/pom.xml   2007-10-03 09:58:41 UTC (rev 5226)
+++ xwiki-platform/core/trunk/pom.xml   2007-10-03 10:05:08 UTC (rev 5227)
@@ -33,12 +33,12 @@
   xwiki-core-parent
   XWiki Platform - Core - Parent POM
   pom
-  1.2-milestone-1
+  1.2-SNAPSHOT
   XWiki Platform - Core - Parent POM
   
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
+
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/core/trunk
+
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/core/trunk
+
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/core/trunk
   
   
 

Modified: xwiki-platform/core/trunk/xwiki-action/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-action/pom.xml  2007-10-03 09:58:41 UTC 
(rev 5226)
+++ xwiki-platform/core/trunk/xwiki-action/pom.xml  2007-10-03 10:05:08 UTC 
(rev 5227)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   org.xwiki.platform
   xwiki-core-action

Modified: xwiki-platform/core/trunk/xwiki-component/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-component/pom.xml   2007-10-03 09:58:41 UTC 
(rev 5226)
+++ xwiki-platform/core/trunk/xwiki-component/pom.xml   2007-10-03 10:05:08 UTC 
(rev 5227)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   org.xwiki.platform
   xwiki-core-component

Modified: xwiki-platform/core/trunk/xwiki-containers/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/pom.xml  2007-10-03 09:58:41 UTC 
(rev 5226)
+++ xwiki-platform/core/trunk/xwiki-containers/pom.xml  2007-10-03 10:05:08 UTC 
(rev 5227)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   org.xwiki.platform
   xwiki-core-containers-parent

Modified: xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml  
2007-10-03 09:58:41 UTC (rev 5226)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml  
2007-10-03 10:05:08 UTC (rev 5227)
@@ -27,7 +27,7 @@
   
 org.xwiki.platform
 xwiki-core-containers-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-core-container-api
   XWiki Platform - Core - Containers - API

Modified: 
xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml  
2007-10-03 09:58:41 UTC (rev 5226)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml  
2007-10-03 10:05:08 UTC (rev 5227)
@@ -27,7 +27,7 @@
   
 org.xwiki.platform
 xwiki-core-containers-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-core-container-servlet
   XWiki Platform - Core - Containers - Servlet

Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 09:58:41 UTC 
(rev 5226)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 10:05:08 UTC 
(rev 5227)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-core
   XWiki Platform - Core - Core

Modified: xwiki-platform/core/trunk/xwiki-observation/pom.xml

[xwiki-notifications] r5228 - xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse xwiki-platform/core/trunk xwiki-platform/pom/trunk xwiki-platform/web/trunk xwiki-platform/xwiki-applicatio

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 12:07:59 +0200 (Wed, 03 Oct 2007)
New Revision: 5228

Modified:
   xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/pom.xml
   xwiki-platform/core/trunk/pom.xml
   xwiki-platform/pom/trunk/pom.xml
   xwiki-platform/web/trunk/pom.xml
   xwiki-platform/xwiki-applications/trunk/pom.xml
   xwiki-platform/xwiki-plugins/trunk/pom.xml
   xwiki-platform/xwiki-tools/trunk/pom.xml
   xwiki-products/curriki/trunk/pom.xml
   xwiki-products/xwiki-enterprise-manager/trunk/pom.xml
   xwiki-products/xwiki-enterprise/trunk/pom.xml
Log:
Upgrade all POMs to use the new SCM URLs.

Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/pom.xml
===
--- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/pom.xml  
2007-10-03 10:05:08 UTC (rev 5227)
+++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/pom.xml  
2007-10-03 10:07:59 UTC (rev 5228)
@@ -13,9 +13,9 @@
   1.0-SNAPSHOT
   Eclipse Integration Plugin
   
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-extensions/xwiki-eclipse/trunk
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-extensions/xwiki-eclipse/trunk
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-extensions/xwiki-eclipse/trunk
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-extensions/xwiki-eclipse/trunk
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-extensions/xwiki-eclipse/trunk
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-extensions/xwiki-eclipse/trunk
   
   
 

Modified: xwiki-platform/core/trunk/pom.xml
===
--- xwiki-platform/core/trunk/pom.xml   2007-10-03 10:05:08 UTC (rev 5227)
+++ xwiki-platform/core/trunk/pom.xml   2007-10-03 10:07:59 UTC (rev 5228)
@@ -36,9 +36,9 @@
   1.2-SNAPSHOT
   XWiki Platform - Core - Parent POM
   
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/core/trunk
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/core/trunk
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/core/trunk
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
+http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
   
   
 

Modified: xwiki-platform/pom/trunk/pom.xml
===
--- xwiki-platform/pom/trunk/pom.xml2007-10-03 10:05:08 UTC (rev 5227)
+++ xwiki-platform/pom/trunk/pom.xml2007-10-03 10:07:59 UTC (rev 5228)
@@ -47,9 +47,9 @@
 http://xwiki.org/
   
   
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/pom/trunk
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/pom/trunk
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/pom/trunk
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/pom/trunk
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/pom/trunk
+http://svn.xwiki.org/svnroot/xwiki/pom/trunk
   
   
 

Modified: xwiki-platform/web/trunk/pom.xml
===
--- xwiki-platform/web/trunk/pom.xml2007-10-03 10:05:08 UTC (rev 5227)
+++ xwiki-platform/web/trunk/pom.xml2007-10-03 10:07:59 UTC (rev 5228)
@@ -34,9 +34,9 @@
   pom
   Common web resources for all XWiki WARs
   
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/web/trunk
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/web/trunk
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/web/trunk
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
+http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
   
   
 

Modified: xwiki-platform/xwiki-applications/trunk/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/pom.xml 2007-10-03 10:05:08 UTC 
(rev 5227)
+++ xwiki-platform/xwiki-applications/trunk/pom.xml 2007-10-03 10:07:59 UTC 
(rev 5228)
@@ -37,9 +37,9 @@
   pom
   XWiki Platform - Applications - Parent POM
   
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/xwiki-applications/trunk
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/xwiki-applications/trunk
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk

[xwiki-notifications] r5229 - in xwiki-platform/core/trunk: . xwiki-action xwiki-component xwiki-containers xwiki-containers/xwiki-container-api xwiki-containers/xwiki-container-servlet xwiki-core xwi

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 12:33:12 +0200 (Wed, 03 Oct 2007)
New Revision: 5229

Modified:
   xwiki-platform/core/trunk/pom.xml
   xwiki-platform/core/trunk/xwiki-action/pom.xml
   xwiki-platform/core/trunk/xwiki-component/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
   xwiki-platform/core/trunk/xwiki-core/pom.xml
   xwiki-platform/core/trunk/xwiki-observation/pom.xml
   xwiki-platform/core/trunk/xwiki-plexus/pom.xml
   xwiki-platform/core/trunk/xwiki-url/pom.xml
   xwiki-platform/core/trunk/xwiki-velocity/pom.xml
Log:
[maven-release-plugin] prepare release xwiki-core-1.2-milestone-1

Modified: xwiki-platform/core/trunk/pom.xml
===
--- xwiki-platform/core/trunk/pom.xml   2007-10-03 10:07:59 UTC (rev 5228)
+++ xwiki-platform/core/trunk/pom.xml   2007-10-03 10:33:12 UTC (rev 5229)
@@ -33,12 +33,12 @@
   xwiki-core-parent
   XWiki Platform - Core - Parent POM
   pom
-  1.2-SNAPSHOT
+  1.2-milestone-1
   XWiki Platform - Core - Parent POM
   
-
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
-
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
-http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
   
   
 

Modified: xwiki-platform/core/trunk/xwiki-action/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-action/pom.xml  2007-10-03 10:07:59 UTC 
(rev 5228)
+++ xwiki-platform/core/trunk/xwiki-action/pom.xml  2007-10-03 10:33:12 UTC 
(rev 5229)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   org.xwiki.platform
   xwiki-core-action

Modified: xwiki-platform/core/trunk/xwiki-component/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-component/pom.xml   2007-10-03 10:07:59 UTC 
(rev 5228)
+++ xwiki-platform/core/trunk/xwiki-component/pom.xml   2007-10-03 10:33:12 UTC 
(rev 5229)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   org.xwiki.platform
   xwiki-core-component

Modified: xwiki-platform/core/trunk/xwiki-containers/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/pom.xml  2007-10-03 10:07:59 UTC 
(rev 5228)
+++ xwiki-platform/core/trunk/xwiki-containers/pom.xml  2007-10-03 10:33:12 UTC 
(rev 5229)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   org.xwiki.platform
   xwiki-core-containers-parent

Modified: xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml  
2007-10-03 10:07:59 UTC (rev 5228)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml  
2007-10-03 10:33:12 UTC (rev 5229)
@@ -27,7 +27,7 @@
   
 org.xwiki.platform
 xwiki-core-containers-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-core-container-api
   XWiki Platform - Core - Containers - API

Modified: 
xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml  
2007-10-03 10:07:59 UTC (rev 5228)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml  
2007-10-03 10:33:12 UTC (rev 5229)
@@ -27,7 +27,7 @@
   
 org.xwiki.platform
 xwiki-core-containers-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-core-container-servlet
   XWiki Platform - Core - Containers - Servlet

Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 10:07:59 UTC 
(rev 5228)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 10:33:12 UTC 
(rev 5229)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-core
   XWiki Platform - Core - Core

Modified: xwiki-platform/core/trunk/xwiki-observation/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-observation/pom.xml 2007-10-03 10:07:59 UTC 
(re

[xwiki-notifications] r5231 - in xwiki-platform/core/trunk: . xwiki-action xwiki-component xwiki-containers xwiki-containers/xwiki-container-api xwiki-containers/xwiki-container-servlet xwiki-core xwi

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 12:33:37 +0200 (Wed, 03 Oct 2007)
New Revision: 5231

Modified:
   xwiki-platform/core/trunk/pom.xml
   xwiki-platform/core/trunk/xwiki-action/pom.xml
   xwiki-platform/core/trunk/xwiki-component/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml
   xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
   xwiki-platform/core/trunk/xwiki-core/pom.xml
   xwiki-platform/core/trunk/xwiki-observation/pom.xml
   xwiki-platform/core/trunk/xwiki-plexus/pom.xml
   xwiki-platform/core/trunk/xwiki-url/pom.xml
   xwiki-platform/core/trunk/xwiki-velocity/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration

Modified: xwiki-platform/core/trunk/pom.xml
===
--- xwiki-platform/core/trunk/pom.xml   2007-10-03 10:33:26 UTC (rev 5230)
+++ xwiki-platform/core/trunk/pom.xml   2007-10-03 10:33:37 UTC (rev 5231)
@@ -33,12 +33,12 @@
   xwiki-core-parent
   XWiki Platform - Core - Parent POM
   pom
-  1.2-milestone-1
+  1.2-SNAPSHOT
   XWiki Platform - Core - Parent POM
   
-
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
-
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
-
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/tags/xwiki-core-1.2-milestone-1
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
+http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/core/trunk
   
   
 

Modified: xwiki-platform/core/trunk/xwiki-action/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-action/pom.xml  2007-10-03 10:33:26 UTC 
(rev 5230)
+++ xwiki-platform/core/trunk/xwiki-action/pom.xml  2007-10-03 10:33:37 UTC 
(rev 5231)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   org.xwiki.platform
   xwiki-core-action

Modified: xwiki-platform/core/trunk/xwiki-component/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-component/pom.xml   2007-10-03 10:33:26 UTC 
(rev 5230)
+++ xwiki-platform/core/trunk/xwiki-component/pom.xml   2007-10-03 10:33:37 UTC 
(rev 5231)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   org.xwiki.platform
   xwiki-core-component

Modified: xwiki-platform/core/trunk/xwiki-containers/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/pom.xml  2007-10-03 10:33:26 UTC 
(rev 5230)
+++ xwiki-platform/core/trunk/xwiki-containers/pom.xml  2007-10-03 10:33:37 UTC 
(rev 5231)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   org.xwiki.platform
   xwiki-core-containers-parent

Modified: xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml  
2007-10-03 10:33:26 UTC (rev 5230)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-api/pom.xml  
2007-10-03 10:33:37 UTC (rev 5231)
@@ -27,7 +27,7 @@
   
 org.xwiki.platform
 xwiki-core-containers-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-core-container-api
   XWiki Platform - Core - Containers - API

Modified: 
xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml  
2007-10-03 10:33:26 UTC (rev 5230)
+++ xwiki-platform/core/trunk/xwiki-containers/xwiki-container-servlet/pom.xml  
2007-10-03 10:33:37 UTC (rev 5231)
@@ -27,7 +27,7 @@
   
 org.xwiki.platform
 xwiki-core-containers-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-core-container-servlet
   XWiki Platform - Core - Containers - Servlet

Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 10:33:26 UTC 
(rev 5230)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 10:33:37 UTC 
(rev 5231)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki-core-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-core
   XWiki Platform - Core - Core

Modified: xwiki-platform/core/trunk/xwiki-observation/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-observation/pom.xml 2007-10-03 10:33:26 UTC 
(rev 52

[xwiki-notifications] r5232 - in xwiki-platform/core/trunk: . xwiki-core

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 12:35:46 +0200 (Wed, 03 Oct 2007)
New Revision: 5232

Modified:
   xwiki-platform/core/trunk/pom.xml
   xwiki-platform/core/trunk/xwiki-core/pom.xml
Log:
Continue work for 1.2M2 on Core.

Modified: xwiki-platform/core/trunk/pom.xml
===
--- xwiki-platform/core/trunk/pom.xml   2007-10-03 10:33:37 UTC (rev 5231)
+++ xwiki-platform/core/trunk/pom.xml   2007-10-03 10:35:46 UTC (rev 5232)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki
-5
+6-SNAPSHOT
 ../xwiki-platform-pom
   
   xwiki-core-parent

Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===
--- xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 10:33:37 UTC 
(rev 5231)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml2007-10-03 10:35:46 UTC 
(rev 5232)
@@ -503,7 +503,7 @@
   
 com.xpn.xwiki.platform
 xwiki-build-verifications
-1.6
+1.7-SNAPSHOT
   
 
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5233 - in xwiki-platform/web/trunk: . exo gwt standard

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 12:41:16 +0200 (Wed, 03 Oct 2007)
New Revision: 5233

Modified:
   xwiki-platform/web/trunk/exo/pom.xml
   xwiki-platform/web/trunk/gwt/pom.xml
   xwiki-platform/web/trunk/pom.xml
   xwiki-platform/web/trunk/standard/pom.xml
Log:
[maven-release-plugin] prepare release xwiki-web-1.2-milestone-1

Modified: xwiki-platform/web/trunk/exo/pom.xml
===
--- xwiki-platform/web/trunk/exo/pom.xml2007-10-03 10:35:46 UTC (rev 
5232)
+++ xwiki-platform/web/trunk/exo/pom.xml2007-10-03 10:41:16 UTC (rev 
5233)
@@ -25,7 +25,7 @@
   
 com.xpn.xwiki.platform
 xwiki-web
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-web-exo
   XWiki Platform - Web - Exo

Modified: xwiki-platform/web/trunk/gwt/pom.xml
===
--- xwiki-platform/web/trunk/gwt/pom.xml2007-10-03 10:35:46 UTC (rev 
5232)
+++ xwiki-platform/web/trunk/gwt/pom.xml2007-10-03 10:41:16 UTC (rev 
5233)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.platform
 xwiki-web
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-web-gwt
   XWiki Platform - Web - GWT API

Modified: xwiki-platform/web/trunk/pom.xml
===
--- xwiki-platform/web/trunk/pom.xml2007-10-03 10:35:46 UTC (rev 5232)
+++ xwiki-platform/web/trunk/pom.xml2007-10-03 10:41:16 UTC (rev 5233)
@@ -29,14 +29,14 @@
 ../xwiki-platform-pom
   
   xwiki-web
-  1.2-SNAPSHOT
+  1.2-milestone-1
   XWiki Platform - Web - Parent POM
   pom
   Common web resources for all XWiki WARs
   
-
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
-
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
-http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
   
   
 

Modified: xwiki-platform/web/trunk/standard/pom.xml
===
--- xwiki-platform/web/trunk/standard/pom.xml   2007-10-03 10:35:46 UTC (rev 
5232)
+++ xwiki-platform/web/trunk/standard/pom.xml   2007-10-03 10:41:16 UTC (rev 
5233)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.platform
 xwiki-web
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-web-standard
   XWiki Platform - Web - Standard

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5234 - in xwiki-platform/web/tags: . xwiki-web-1.2-milestone-1 xwiki-web-1.2-milestone-1/exo xwiki-web-1.2-milestone-1/gwt xwiki-web-1.2-milestone-1/standard

2007-10-03 Thread SVN
SHOT
-  
-  xwiki-web-gwt
-  XWiki Platform - Web - GWT API
-  jar
-  The Common GWT API XWiki JAR
-  
-
-  com.google.gwt
-  gwt-servlet
-  1.3.3
-
-
-  com.google.gwt
-  gwt-user
-  1.3.3
-  
-  provided
-
-
-
-  gwttk
-  gwttk
-  0.2.2
-  
-  provided
-
-
-  com.xpn.xwiki.platform
-  xwiki-core
-  1.2-SNAPSHOT
-  
-  provided
-
-
-
-  javax.servlet
-  servlet-api
-  
-  2.4
-  provided
-
-  
-  
-
-  
-  
-org.apache.maven.plugins
-maven-source-plugin
-
-  
-
-  jar
-
-  
-
-  
-
-  
-  
-
-  gwt-maven
-  http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
-
-  
-

Copied: xwiki-platform/web/tags/xwiki-web-1.2-milestone-1/gwt/pom.xml (from rev 
5233, xwiki-platform/web/trunk/gwt/pom.xml)
===
--- xwiki-platform/web/tags/xwiki-web-1.2-milestone-1/gwt/pom.xml   
(rev 0)
+++ xwiki-platform/web/tags/xwiki-web-1.2-milestone-1/gwt/pom.xml   
2007-10-03 10:41:26 UTC (rev 5234)
@@ -0,0 +1,79 @@
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+  
+com.xpn.xwiki.platform
+xwiki-web
+1.2-milestone-1
+  
+  xwiki-web-gwt
+  XWiki Platform - Web - GWT API
+  jar
+  The Common GWT API XWiki JAR
+  
+
+  com.google.gwt
+  gwt-servlet
+  1.3.3
+
+
+  com.google.gwt
+  gwt-user
+  1.3.3
+  
+  provided
+
+
+
+  gwttk
+  gwttk
+  0.2.2
+  
+  provided
+
+
+  com.xpn.xwiki.platform
+  xwiki-core
+  ${platform.core.version}
+  
+  provided
+
+
+
+  javax.servlet
+  servlet-api
+  
+  2.4
+  provided
+
+  
+  
+
+  
+  
+org.apache.maven.plugins
+maven-source-plugin
+
+  
+
+  jar
+        
+  
+
+  
+
+  
+  
+
+  gwt-maven
+  http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
+
+  
+

Deleted: xwiki-platform/web/tags/xwiki-web-1.2-milestone-1/pom.xml
===
--- xwiki-platform/web/trunk/pom.xml2007-10-03 00:56:30 UTC (rev 5219)
+++ xwiki-platform/web/tags/xwiki-web-1.2-milestone-1/pom.xml   2007-10-03 
10:41:26 UTC (rev 5234)
@@ -1,70 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  4.0.0
-  
-com.xpn.xwiki.platform
-xwiki
-6-SNAPSHOT
-../xwiki-platform-pom
-  
-  xwiki-web
-  1.2-SNAPSHOT
-  XWiki Platform - Web - Parent POM
-  pom
-  Common web resources for all XWiki WARs
-  
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/web/trunk
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/web/trunk
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/web/trunk
-  
-  
-
-  default
-  
-true
-  
-  
-gwt
-standard
-exo
-  
-
-
-  
-  xe
-  
-gwt
-standard
-  
-
-
-  
-  xem
-  
-gwt
-standard
-  
-
-  
-

Copied: xwiki-platform/web/tags/xwiki-web-1.2-milestone-1/pom.xml (from rev 
5233, xwiki-platform/web/trunk/pom.xml)
===
--- xwiki-platform/web/tags/xwiki-web-1.2-milestone-1/pom.xml   
(rev 0)
+++ xwiki-platform/web/tags/xwiki-web-1.2-milestone-1/pom.xml   2007-10-03 
10:41:26 UTC (rev 5234)
@@ -0,0 +1,75 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+  
+com.xpn.xwiki.platform
+xwiki
+5
+../xwiki-platform-pom
+  
+  xwiki-web
+  1.2-milestone-1
+  XWiki Platform - Web - Parent POM
+  pom
+  Common web resources for all XWiki WARs
+  
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
+  
+  
+
+1.6
+1.2-milestone-1
+  
+  
+
+  default
+  
+true
+  
+  
+gwt
+standard

[xwiki-notifications] r5235 - in xwiki-platform/web/trunk: . exo gwt standard

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 12:41:34 +0200 (Wed, 03 Oct 2007)
New Revision: 5235

Modified:
   xwiki-platform/web/trunk/exo/pom.xml
   xwiki-platform/web/trunk/gwt/pom.xml
   xwiki-platform/web/trunk/pom.xml
   xwiki-platform/web/trunk/standard/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration

Modified: xwiki-platform/web/trunk/exo/pom.xml
===
--- xwiki-platform/web/trunk/exo/pom.xml2007-10-03 10:41:26 UTC (rev 
5234)
+++ xwiki-platform/web/trunk/exo/pom.xml2007-10-03 10:41:34 UTC (rev 
5235)
@@ -25,7 +25,7 @@
   
 com.xpn.xwiki.platform
 xwiki-web
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-web-exo
   XWiki Platform - Web - Exo

Modified: xwiki-platform/web/trunk/gwt/pom.xml
===
--- xwiki-platform/web/trunk/gwt/pom.xml2007-10-03 10:41:26 UTC (rev 
5234)
+++ xwiki-platform/web/trunk/gwt/pom.xml2007-10-03 10:41:34 UTC (rev 
5235)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.platform
 xwiki-web
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-web-gwt
   XWiki Platform - Web - GWT API

Modified: xwiki-platform/web/trunk/pom.xml
===
--- xwiki-platform/web/trunk/pom.xml2007-10-03 10:41:26 UTC (rev 5234)
+++ xwiki-platform/web/trunk/pom.xml2007-10-03 10:41:34 UTC (rev 5235)
@@ -29,14 +29,14 @@
 ../xwiki-platform-pom
   
   xwiki-web
-  1.2-milestone-1
+  1.2-SNAPSHOT
   XWiki Platform - Web - Parent POM
   pom
   Common web resources for all XWiki WARs
   
-
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
-
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
-
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-milestone-1
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
+http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/trunk
   
   
 

Modified: xwiki-platform/web/trunk/standard/pom.xml
===
--- xwiki-platform/web/trunk/standard/pom.xml   2007-10-03 10:41:26 UTC (rev 
5234)
+++ xwiki-platform/web/trunk/standard/pom.xml   2007-10-03 10:41:34 UTC (rev 
5235)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.platform
 xwiki-web
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-web-standard
   XWiki Platform - Web - Standard

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5236 - xwiki-platform/web/trunk

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:04:30 +0200 (Wed, 03 Oct 2007)
New Revision: 5236

Modified:
   xwiki-platform/web/trunk/
   xwiki-platform/web/trunk/pom.xml
Log:
Continue work for 1.2M2 on Platform Web.


Property changes on: xwiki-platform/web/trunk
___
Name: svn:ignore
   - xwiki-web.iml
nbproject

   + xwiki-web.iml
nbproject
target


Modified: xwiki-platform/web/trunk/pom.xml
===
--- xwiki-platform/web/trunk/pom.xml2007-10-03 10:41:34 UTC (rev 5235)
+++ xwiki-platform/web/trunk/pom.xml2007-10-03 12:04:30 UTC (rev 5236)
@@ -40,8 +40,8 @@
   
   
 
-1.6
-1.2-milestone-1
+1.7-SNAPSHOT
+1.2-SNAPSHOT
   
   
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5237 - xwiki-platform/xwiki-applications/trunk/panels

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:07:16 +0200 (Wed, 03 Oct 2007)
New Revision: 5237

Modified:
   xwiki-platform/xwiki-applications/trunk/panels/pom.xml
Log:
Prepare for 1.2M1 release

Modified: xwiki-platform/xwiki-applications/trunk/panels/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:04:30 UTC (rev 5236)
+++ xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:07:16 UTC (rev 5237)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform.applications
 xwiki-applications
-7-SNAPSHOT
+6
   
   xwiki-application-panels
   XWiki Platform - Applications - Panels

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5238 - xwiki-platform/xwiki-applications/trunk/panels

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:09:04 +0200 (Wed, 03 Oct 2007)
New Revision: 5238

Modified:
   xwiki-platform/xwiki-applications/trunk/panels/pom.xml
Log:
[maven-release-plugin] prepare release xwiki-application-panels-1.2-milestone-1

Modified: xwiki-platform/xwiki-applications/trunk/panels/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:07:16 UTC (rev 5237)
+++ xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:09:04 UTC (rev 5238)
@@ -31,7 +31,13 @@
   
   xwiki-application-panels
   XWiki Platform - Applications - Panels
-  1.2-SNAPSHOT
+  1.2-milestone-1
   xar
   Panels and Panel Wizard to easily create menus for 
XWiki
+
+  
+
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+  
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5239 - xwiki-platform/xwiki-applications/trunk/panels

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:15:15 +0200 (Wed, 03 Oct 2007)
New Revision: 5239

Modified:
   xwiki-platform/xwiki-applications/trunk/panels/pom.xml
Log:
Prepare for 1.2M1 release

Modified: xwiki-platform/xwiki-applications/trunk/panels/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:09:04 UTC (rev 5238)
+++ xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:15:15 UTC (rev 5239)
@@ -34,10 +34,9 @@
   1.2-milestone-1
   xar
   Panels and Panel Wizard to easily create menus for 
XWiki
-
   
-
scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
-
scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
-
http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
   
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5240 - xwiki-platform/xwiki-applications/trunk/panels

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:17:31 +0200 (Wed, 03 Oct 2007)
New Revision: 5240

Modified:
   xwiki-platform/xwiki-applications/trunk/panels/pom.xml
Log:
[maven-release-plugin] rollback the release of 
xwiki-application-panels-1.2-milestone-1

Modified: xwiki-platform/xwiki-applications/trunk/panels/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:15:15 UTC (rev 5239)
+++ xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:17:31 UTC (rev 5240)
@@ -31,12 +31,7 @@
   
   xwiki-application-panels
   XWiki Platform - Applications - Panels
-  1.2-milestone-1
+  1.2-SNAPSHOT
   xar
   Panels and Panel Wizard to easily create menus for 
XWiki
-  
-
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
-
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
-
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
-  
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5241 - xwiki-platform/xwiki-applications/trunk/panels

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:18:36 +0200 (Wed, 03 Oct 2007)
New Revision: 5241

Modified:
   xwiki-platform/xwiki-applications/trunk/panels/pom.xml
Log:
Prepare for 1.2M1 release

Modified: xwiki-platform/xwiki-applications/trunk/panels/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:17:31 UTC (rev 5240)
+++ xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:18:36 UTC (rev 5241)
@@ -34,4 +34,9 @@
   1.2-SNAPSHOT
   xar
   Panels and Panel Wizard to easily create menus for 
XWiki
+  
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
+  
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5242 - xwiki-platform/xwiki-applications/trunk/panels

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:18:55 +0200 (Wed, 03 Oct 2007)
New Revision: 5242

Modified:
   xwiki-platform/xwiki-applications/trunk/panels/pom.xml
Log:
[maven-release-plugin] prepare release xwiki-application-panels-1.2-milestone-1

Modified: xwiki-platform/xwiki-applications/trunk/panels/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:18:36 UTC (rev 5241)
+++ xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:18:55 UTC (rev 5242)
@@ -31,12 +31,12 @@
   
   xwiki-application-panels
   XWiki Platform - Applications - Panels
-  1.2-SNAPSHOT
+  1.2-milestone-1
   xar
   Panels and Panel Wizard to easily create menus for 
XWiki
   
-
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
-
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
-
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
   
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5243 - in xwiki-platform/xwiki-applications/tags: . xwiki-application-panels-1.2-milestone-1

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:19:02 +0200 (Wed, 03 Oct 2007)
New Revision: 5243

Added:
   
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1/
   
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1/pom.xml
Removed:
   
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1/pom.xml
Log:
[maven-release-plugin]  copy for tag xwiki-application-panels-1.2-milestone-1

Copied: 
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1 
(from rev 5235, xwiki-platform/xwiki-applications/trunk/panels)

Deleted: 
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
10:41:34 UTC (rev 5235)
+++ 
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1/pom.xml
 2007-10-03 12:19:02 UTC (rev 5243)
@@ -1,37 +0,0 @@
-
-
-
-
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  4.0.0
-  
-com.xpn.xwiki.platform.applications
-xwiki-applications
-7-SNAPSHOT
-  
-  xwiki-application-panels
-  XWiki Platform - Applications - Panels
-  1.2-SNAPSHOT
-  xar
-  Panels and Panel Wizard to easily create menus for 
XWiki
-

Copied: 
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1/pom.xml
 (from rev 5242, xwiki-platform/xwiki-applications/trunk/panels/pom.xml)
===
--- 
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1/pom.xml
 (rev 0)
+++ 
xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1/pom.xml
 2007-10-03 12:19:02 UTC (rev 5243)
@@ -0,0 +1,42 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+  
+com.xpn.xwiki.platform.applications
+xwiki-applications
+6
+  
+  xwiki-application-panels
+  XWiki Platform - Applications - Panels
+  1.2-milestone-1
+  xar
+  Panels and Panel Wizard to easily create menus for 
XWiki
+  
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+  
+

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5244 - xwiki-platform/xwiki-applications/trunk/panels

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:19:06 +0200 (Wed, 03 Oct 2007)
New Revision: 5244

Modified:
   xwiki-platform/xwiki-applications/trunk/panels/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration

Modified: xwiki-platform/xwiki-applications/trunk/panels/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:19:02 UTC (rev 5243)
+++ xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:19:06 UTC (rev 5244)
@@ -31,12 +31,12 @@
   
   xwiki-application-panels
   XWiki Platform - Applications - Panels
-  1.2-milestone-1
+  1.2-SNAPSHOT
   xar
   Panels and Panel Wizard to easily create menus for 
XWiki
   
-
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
-
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
-
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/tags/xwiki-application-panels-1.2-milestone-1
+
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
+
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
+
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
   
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5245 - xwiki-platform/xwiki-applications/trunk/panels

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:21:14 +0200 (Wed, 03 Oct 2007)
New Revision: 5245

Modified:
   xwiki-platform/xwiki-applications/trunk/panels/pom.xml
Log:
Continue work on 1.2M2

Modified: xwiki-platform/xwiki-applications/trunk/panels/pom.xml
===
--- xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:19:06 UTC (rev 5244)
+++ xwiki-platform/xwiki-applications/trunk/panels/pom.xml  2007-10-03 
12:21:14 UTC (rev 5245)
@@ -27,16 +27,11 @@
   
 com.xpn.xwiki.platform.applications
 xwiki-applications
-6
+7-SNAPSHOT
   
   xwiki-application-panels
   XWiki Platform - Applications - Panels
   1.2-SNAPSHOT
   xar
   Panels and Panel Wizard to easily create menus for 
XWiki
-  
-
scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
-
scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
-
http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-applications/trunk/panels
-  
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5246 - in xwiki-products/xwiki-enterprise/trunk: . distribution distribution-test/xmlrpc-tests installers installers/generic wiki

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:27:08 +0200 (Wed, 03 Oct 2007)
New Revision: 5246

Modified:
   xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/
   xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
   xwiki-products/xwiki-enterprise/trunk/pom.xml
   xwiki-products/xwiki-enterprise/trunk/wiki/pom.xml
Log:
Prepare for 1.2M1 release of XE

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
12:21:14 UTC (rev 5245)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
12:27:08 UTC (rev 5246)
@@ -39,7 +39,7 @@
 
   com.xpn.xwiki.platform
   xwiki-web-standard
-  1.2-SNAPSHOT
+  ${platform.web.version}
   war
 
 

Modified: 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
===
--- 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
2007-10-03 12:21:14 UTC (rev 5245)
+++ 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
2007-10-03 12:27:08 UTC (rev 5246)
@@ -13,7 +13,7 @@
 
   com.xpn.xwiki.platform
   xwiki-core
-  1.2-SNAPSHOT
+  ${platform.core.version}
   test
 
   


Property changes on: xwiki-products/xwiki-enterprise/trunk/installers
___
Name: svn:ignore
   - nbproject

   + nbproject
*.iml
*.ipr
*.iws


Modified: xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
2007-10-03 12:21:14 UTC (rev 5245)
+++ xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
2007-10-03 12:27:08 UTC (rev 5246)
@@ -66,7 +66,7 @@
 
   com.xpn.xwiki.platform
   xwiki-web-standard
-  1.2-SNAPSHOT
+  ${platform.web.version}
   war
   
${project.build.directory}/container/webapps/xwiki
 

Modified: xwiki-products/xwiki-enterprise/trunk/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/pom.xml   2007-10-03 12:21:14 UTC 
(rev 5245)
+++ xwiki-products/xwiki-enterprise/trunk/pom.xml   2007-10-03 12:27:08 UTC 
(rev 5246)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki
-6-SNAPSHOT
+5
 ../xwiki-platform-pom
   
   com.xpn.xwiki.products
@@ -47,8 +47,11 @@
 distribution
   
   
-
-1.7-SNAPSHOT
+
+1.6
+1.2-milestone-1
+1.2-milestone-1
+1.2-milestone-1
   
   
 

Modified: xwiki-products/xwiki-enterprise/trunk/wiki/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/wiki/pom.xml  2007-10-03 12:21:14 UTC 
(rev 5245)
+++ xwiki-products/xwiki-enterprise/trunk/wiki/pom.xml  2007-10-03 12:27:08 UTC 
(rev 5246)
@@ -13,7 +13,7 @@
 
   com.xpn.xwiki.platform.applications
   xwiki-application-panels
-  1.2-SNAPSHOT
+  ${platform.panels.version}
   xar
 
   

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5247 - in xwiki-products/xwiki-enterprise/trunk: . database database/hsqldb distribution distribution/hsqldb distribution-test distribution-test/selenium-tests distribution-test

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:58:38 +0200 (Wed, 03 Oct 2007)
New Revision: 5247

Modified:
   xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/trunk/database/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml
   
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/windows/pom.xml
   xwiki-products/xwiki-enterprise/trunk/pom.xml
   xwiki-products/xwiki-enterprise/trunk/wiki/pom.xml
Log:
[maven-release-plugin] prepare release xwiki-enterprise-1.2-milestone-1

Modified: xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml   
2007-10-03 12:27:08 UTC (rev 5246)
+++ xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml   
2007-10-03 12:58:38 UTC (rev 5247)
@@ -1,33 +1,9 @@
-
-
-http://maven.apache.org/POM/4.0.0";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
   
 com.xpn.xwiki.products
 xwiki-enterprise-database
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-database-hsqldb
   XWiki Products - Enterprise - Database - HSQLDB
@@ -80,7 +56,7 @@
 -classpath
 
-
+
 org.hsqldb.util.DatabaseManager
 -driver
 org.hsqldb.jdbcDriver
@@ -93,4 +69,4 @@
   
 
   
-
+
\ No newline at end of file

Modified: xwiki-products/xwiki-enterprise/trunk/database/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/database/pom.xml  2007-10-03 
12:27:08 UTC (rev 5246)
+++ xwiki-products/xwiki-enterprise/trunk/database/pom.xml  2007-10-03 
12:58:38 UTC (rev 5247)
@@ -1,33 +1,9 @@
-
-
-http://maven.apache.org/POM/4.0.0";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-database
   XWiki Products - Enterprise - Database - Parent POM
@@ -158,4 +134,4 @@
   
 
   
-
+
\ No newline at end of file

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml   
2007-10-03 12:27:08 UTC (rev 5246)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml   
2007-10-03 12:58:38 UTC (rev 5247)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-hsqldb
   XWiki Products - Enterprise - Distribution - HSQLDB

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
12:27:08 UTC (rev 5246)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
12:58:38 UTC (rev 5247)
@@ -1,35 +1,9 @@
-
-
-
-
-http://maven.apache.org/POM/4.0.0";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   4.0.0
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise
   XWiki Products - Enterprise - Distribution - Parent POM

Modified: xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml 
2007-10-03 12:27:08 UTC (rev 5246)
+++ xwiki-products/xwiki-enterprise/trunk

[xwiki-notifications] r5249 - in xwiki-products/xwiki-enterprise/trunk: . database database/hsqldb distribution distribution/hsqldb distribution-test distribution-test/selenium-tests distribution-test

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 14:58:57 +0200 (Wed, 03 Oct 2007)
New Revision: 5249

Modified:
   xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/trunk/database/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml
   
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/windows/pom.xml
   xwiki-products/xwiki-enterprise/trunk/pom.xml
   xwiki-products/xwiki-enterprise/trunk/wiki/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration

Modified: xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml   
2007-10-03 12:58:49 UTC (rev 5248)
+++ xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml   
2007-10-03 12:58:57 UTC (rev 5249)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-database
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-database-hsqldb
   XWiki Products - Enterprise - Database - HSQLDB

Modified: xwiki-products/xwiki-enterprise/trunk/database/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/database/pom.xml  2007-10-03 
12:58:49 UTC (rev 5248)
+++ xwiki-products/xwiki-enterprise/trunk/database/pom.xml  2007-10-03 
12:58:57 UTC (rev 5249)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-database
   XWiki Products - Enterprise - Database - Parent POM

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml   
2007-10-03 12:58:49 UTC (rev 5248)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml   
2007-10-03 12:58:57 UTC (rev 5249)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-hsqldb
   XWiki Products - Enterprise - Distribution - HSQLDB

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
12:58:49 UTC (rev 5248)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
12:58:57 UTC (rev 5249)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise
   XWiki Products - Enterprise - Distribution - Parent POM

Modified: xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml 
2007-10-03 12:58:49 UTC (rev 5248)
+++ xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml 
2007-10-03 12:58:57 UTC (rev 5249)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-test
   XWiki Products - Enterprise - Functional Tests

Modified: 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml
===
--- 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml  
2007-10-03 12:58:49 UTC (rev 5248)
+++ 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml  
2007-10-03 12:58:57 UTC (rev 5249)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-test
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-test-selenium
   XWiki Products - Enterprise - Functional Selenium Tests

Modified: 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
===
--- 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
2007-10-03 12:58:49 UTC (rev 5248)
+++ 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
2007-10-03 12:58:57 UTC (rev 5249)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-test
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-test-xmlrpc
   XWiki Products - Enterprise - Functional XMLRPC Tests

Modified: xwiki-products/xwiki-enterprise/trunk/installers/gener

[xwiki-notifications] r5250 - xwiki-products/xwiki-enterprise/trunk

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 15:56:50 +0200 (Wed, 03 Oct 2007)
New Revision: 5250

Modified:
   xwiki-products/xwiki-enterprise/trunk/pom.xml
Log:
Continue work for 1.2M2

Modified: xwiki-products/xwiki-enterprise/trunk/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/pom.xml   2007-10-03 12:58:57 UTC 
(rev 5249)
+++ xwiki-products/xwiki-enterprise/trunk/pom.xml   2007-10-03 13:56:50 UTC 
(rev 5250)
@@ -48,10 +48,10 @@
   
   
 
-1.6
-1.2-milestone-1
-1.2-milestone-1
-1.2-milestone-1
+1.7-SNAPSHOT
+1.2-SNAPSHOT
+1.2-SNAPSHOT
+1.2-SNAPSHOT
   
   
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5251 - xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 16:34:45 +0200 (Wed, 03 Oct 2007)
New Revision: 5251

Modified:
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerException.java
Log:
* XAWM-8 : Throw exception if XWiki is not in virtual mode with message saying 
that you have to make sure property "xwiki.virtual" is setted to 
"xwiki.virtual=1" in xwiki.cfg file.
* Improve javadoc.

Modified: 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
 2007-10-03 13:56:50 UTC (rev 5250)
+++ 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
 2007-10-03 14:34:45 UTC (rev 5251)
@@ -53,8 +53,14 @@
 {
 }
 
+/**
+ * Unique instance of WikiManager.
+ */
 private static WikiManager _instance = null;
 
+/**
+ * @return a unique instance of WikiManager. Thread safe.
+ */
 public static WikiManager getInstance()
 {
 synchronized (WikiManager.class) {
@@ -68,39 +74,72 @@
 // 

 // Utils
 
-public void saveDocument(String wiki, XWikiDocument doc, XWikiContext 
context)
+/**
+ * Encapsulate [EMAIL PROTECTED] 
com.xpn.xwiki.XWiki#saveDocument(XWikiDocument, XWikiContext)} adding wiki
+ * switch.
+ * 
+ * @param wikiName the name of the wiki where to save the document.
+ * @param doc the document to save.
+ * @param context the XWiki Context.
+ * @throws XWikiException
+ * @see com.xpn.xwiki.XWiki#saveDocument(XWikiDocument, XWikiContext)
+ */
+public void saveDocument(String wikiName, XWikiDocument doc, XWikiContext 
context)
 throws XWikiException
 {
 String database = context.getDatabase();
 
 try {
-context.setDatabase(wiki);
+context.setDatabase(wikiName);
 context.getWiki().saveDocument(doc, context);
 } finally {
 context.setDatabase(database);
 }
 }
 
-public XWikiDocument getDocument(String wiki, String fullname, 
XWikiContext context)
+/**
+ * Encapsulate [EMAIL PROTECTED] com.xpn.xwiki.XWiki#getDocument(String, 
XWikiContext)} adding wiki switch.
+ * 
+ * @param wikiName the name of the wiki where to get the document.
+ * @param fullname the full name of the document to get.
+ * @param context the XWiki context.
+ * @return the document with full name equals to fullname and 
wiki
+ * wikiName. If it dos not exist return new 
XWikiDocument.
+ * @throws XWikiException
+ * @see om.xpn.xwiki.XWiki#getDocument(String, XWikiContext)
+ */
+public XWikiDocument getDocument(String wikiName, String fullname, 
XWikiContext context)
 throws XWikiException
 {
 String database = context.getDatabase();
 
 try {
-context.setDatabase(wiki);
+context.setDatabase(wikiName);
 return context.getWiki().getDocument(fullname, context);
 } finally {
 context.setDatabase(database);
 }
 }
 
-public List searchDocuments(String wiki, String wheresql, XWikiContext 
context)
+/**
+ * Encapsulate [EMAIL PROTECTED] 
com.xpn.xwiki.XWiki#searchDocuments(String, XWikiContext)} adding wiki
+ * switch.
+ * 
+ * @param wikiName the name of the wiki where to search for documents.
+ * @param wheresql the conditions to add to HQL request.
+ * @param context the XWiki context.
+ * @return the list of documents that match the wheresql 
conditions. If nothing
+ * found return empty List.
+ * @throws XWikiException
+ * @see com.xpn.xwiki.XWiki#searchDocuments(String, XWikiContext)
+ */
+public List searchDocuments(String wikiName, String wheresql, XWikiContext 
context)
 throws XWikiException
 {
 String database = context.getDatabase();
 
 try {
-context.setDatabase(wiki);
+context.setDatabase(wikiName);
 return context.getWiki().getStore().searchDocuments(wheresql, 
context);
 } finally {
 context.setDatabase(database);
@@ -114,28 +153,31 @@
 throws XWikiException
 {
 // Get applications manger
-ApplicationManagerPluginApi appmanager = (ApplicationManagerPluginApi) 
context.getWiki().getPluginApi(ApplicationManagerPlugin.PLUGIN_NAME, context);
-
+ApplicationManagerPluginApi appmanager =
+(ApplicationManagerPluginApi) context.getWiki().getPluginApi(
+

[xwiki-notifications] r5252 - in xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client: . search/editor

2007-10-03 Thread SVN
Author: dward
Date: 2007-10-03 17:03:53 +0200 (Wed, 03 Oct 2007)
New Revision: 5252

Removed:
   xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/model/
Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/editor/ViewPanel.java
Log:
- CURRIKI-1006
 - Added styles to add and back buttons of view

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/editor/ViewPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/editor/ViewPanel.java
  2007-10-03 14:34:45 UTC (rev 5251)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/editor/ViewPanel.java
  2007-10-03 15:03:53 UTC (rev 5252)
@@ -70,12 +70,14 @@
 act.onClick(sender);
 }
 });
+a.addStyleName("view-action-add");
 actions.add(a);
 Button b = new Button(Main.getTranslation("editor.btt_back"), new 
ClickListener() {
 public void onClick(Widget sender) {
 dialog.hide();
 }
 });
+b.addStyleName("view-action-back");
 actions.add(b);
 
 main.add(actions);

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5253 - xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 17:45:32 +0200 (Wed, 03 Oct 2007)
New Revision: 5253

Modified:
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
Log:
* XAAM-10 : Add support for matching string in application descriptor to be 
able, for example, to add in one string all document ending with "Class" in 
specific Space.
* XAAM-8 : Set new application descriptor document default parent to 
XAppManager.WebHome
* Improve javadoc

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
  2007-10-03 15:03:53 UTC (rev 5252)
+++ 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
  2007-10-03 15:45:32 UTC (rev 5253)
@@ -20,98 +20,210 @@
 
 package com.xpn.xwiki.plugin.applicationmanager.doc;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
 import 
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.DefaultSuperDocument;
+import 
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.SuperClass;
 import com.xpn.xwiki.doc.XWikiDocument;
 
+/**
+ * This class manage an XWiki document containing XWiki.XWikiApplicationClass 
object. It add some
+ * specifics methods, getters and setters for this type of object and fields.
+ * 
+ * @see 
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.DefaultSuperDocument
+ */
 public class XWikiApplication extends DefaultSuperDocument
 {
+/**
+ * Pattern to match that indicate if a document name contains SQL "like" 
matching string.
+ */
+static private final Pattern extDocNamePattern = 
Pattern.compile("^\\[(.*)\\]$");
+
+/**
+ * Create new XWikiApplication managing provided XWikiDocument.
+ * 
+ * @param xdoc the encapsulated XWikiDocument
+ * @param context the XWiki context
+ * @throws XWikiException
+ * @see 
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.DefaultSuperDocument#DefaultSuperDocument(SuperClass,
+ *  XWikiDocument, XWikiContext)
+ */
 public XWikiApplication(XWikiDocument xdoc, XWikiContext context) throws 
XWikiException
 {
 super(XWikiApplicationClass.getInstance(context), xdoc, context);
 }
 
+/**
+ * [EMAIL PROTECTED]
+ * 
+ * Add some specifics action for Application Manager descriptors document.
+ * 
+ *  Initialize application version to "1.0".
+ *  Set descriptor document default parent to Application Manager home 
page :
+ * XAppManager.WebHome.
+ * 
+ * 
+ * @see 
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.DefaultSuperDocument#reload(com.xpn.xwiki.XWikiContext)
+ */
 public void reload(XWikiContext context) throws XWikiException
 {
 super.reload(context);
 
 if (getAppVersion().length() == 0)
 setAppVersion("1.0");
+
+if (super.isNew())
+// set Application Manager home as default parent for all 
applications descriptors
+setParent(sclass.getClassSpacePrefix() + "Manager.WebHome");
 }
 
 // ///
 
+/**
+ * @return the name of the application
+ * @see #setAppName(String)
+ */
 public String getAppName()
 {
 return getStringValue(XWikiApplicationClass.FIELD_appname);
 }
 
+/**
+ * Modify the name of the application.
+ * 
+ * @param appname the new name of the application.
+ * @see #getAppName()
+ */
 public void setAppName(String appname)
 {
 setStringValue(XWikiApplicationClass.FIELD_appname, appname);
 }
 
+/**
+ * @return the description of the application.
+ * @see #setDescription(String)
+ */
 public String getDescription()
 {
 return getStringValue(XWikiApplicationClass.FIELD_description);
 }
 
+/**
+ * Modify the description of the application.
+ * 
+ * @param description the new description of the application.
+ * @see #getDescription()
+ */
 public void setDescription(String description)
 {
 setStringValue(XWikiApplicationClass.FIELD_description, description);
 }
 
+/**
+ * @return the version of the application.
+ * @see #setAppVersion(String)
+ */
 public String 

[xwiki-notifications] r5254 - xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 17:45:45 +0200 (Wed, 03 Oct 2007)
New Revision: 5254

Modified:
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
Log:
* XAAM-10 : Add support for matching string in application descriptor to be 
able, for example, to add in one string all document ending with "Class" in 
specific Space.
* XAAM-8 : Set new application descriptor document default parent to 
XAppManager.WebHome
* Improve javadoc

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
===
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
2007-10-03 15:45:32 UTC (rev 5253)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
2007-10-03 15:45:45 UTC (rev 5254)
@@ -6,15 +6,15 @@
 
 en
 0
-XAppClasses.XWikiApplicationClass
+XAppManager.WebHome
 
 XWiki.Admin
 
 XWiki.Admin
 1188210392000
-1190919242000
-1190919242000
-1.2
+1191425573000
+1191425573000
+1.5
 
 
 
@@ -229,10 +229,7 @@
 XAppManager.WebHome
 XAppManager.CreateApplication
 XAppResources.Translations
-XAppCode.DeleteAppCode
-XAppCode.ExportAppCode
-XAppCode.ImportAppCode
-XAppCode.ReloadAppCode
+[XAppCode.%Code]
 
 
 
@@ -274,5 +271,5 @@
 
 
 
-#includeForm("XAppSheets.XWikiApplicationClassSheet")
+#includeForm("XAppSheets.XWikiApplicationClassSheet")
 
\ No newline at end of file

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
===
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
   2007-10-03 15:45:32 UTC (rev 5253)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXwikiapplicationclass
   2007-10-03 15:45:45 UTC (rev 5254)
@@ -6,15 +6,15 @@
 
 en
 0
-XAppClasses.XWikiApplicationClass
+XAppManager.WebHome
 
 XWiki.Admin
 
 XWiki.Admin
 1188210358000
-1188464753000
-1189614079000
-1.1
+1191425558000
+1191425558000
+1.2
 
 
 
@@ -264,5 +264,5 @@
 
 
 
-#includeForm("XAppSheets.XWikiApplicationClassSheet")
+#includeForm("XAppSheets.XWikiApplicationClassSheet")
 
\ No newline at end of file

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5255 - xwiki-products/xwiki-enterprise/tags

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 17:47:53 +0200 (Wed, 03 Oct 2007)
New Revision: 5255

Removed:
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-milestone-1/
Log:
Removing the 1.2M1 release. There was a problem with the generic installer. 
Will release again.

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5256 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 17:49:31 +0200 (Wed, 03 Oct 2007)
New Revision: 5256

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationXwikiserverclass
Log:
* Set applications descriptors documents parent to XAppManager.WebHome
* XAWM-9: Modify applications descriptor lists definitions to use XAAM-10

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
2007-10-03 15:47:53 UTC (rev 5255)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
2007-10-03 15:49:31 UTC (rev 5256)
@@ -6,15 +6,15 @@
 
 en
 0
-XAppClasses.XWikiApplicationClass
+XAppManager.WebHome
 
 XWiki.Admin
 
 XWiki.Admin
 1188210403000
-1190978504000
-1190978504000
-1.3
+1191425537000
+1191425537000
+1.7
 
 
 
@@ -230,8 +230,8 @@
 WikiManager.CreateNewWiki
 WikiManager.WebHome
 WikiResources.Translations
-WikiCode.DeleteWikiCode
-WikiCode.SetWikiVisibilityCode
+[WikiCode.%Code]
+[WikiCode.%Macros]
 
 
 
@@ -273,5 +273,5 @@
 
 
 
-#includeForm("XAppSheets.XWikiApplicationClassSheet")
+#includeForm("XAppSheets.XWikiApplicationClassSheet")
 
\ No newline at end of file

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationXwikiserverclass
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationXwikiserverclass
   2007-10-03 15:47:53 UTC (rev 5255)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationXwikiserverclass
   2007-10-03 15:49:31 UTC (rev 5256)
@@ -6,15 +6,15 @@
 
 en
 0
-XAppClasses.XWikiApplicationClass
+XAppManager.WebHome
 
 XWiki.Admin
 
 XWiki.Admin
 118821038
-118846470
-1189614079000
-1.1
+1191425583000
+1191425583000
+1.2
 
 
 
@@ -264,5 +264,5 @@
 
 
 
-#includeForm("XAppSheets.XWikiApplicationClassSheet")
+#includeForm("XAppSheets.XWikiApplicationClassSheet")
 
\ No newline at end of file

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5257 - xwiki-products/xwiki-enterprise/trunk/installers/generic

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 17:50:06 +0200 (Wed, 03 Oct 2007)
New Revision: 5257

Modified:
   xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
Log:
Fixed issue in generic installer

Modified: xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
2007-10-03 15:49:31 UTC (rev 5256)
+++ xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
2007-10-03 15:50:06 UTC (rev 5257)
@@ -78,6 +78,9 @@
   
${project.build.directory}/database
 
   
+  
+  **/hibernate.cfg.xml
 
   
   

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5258 - xwiki-products/xwiki-enterprise/trunk

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 17:51:10 +0200 (Wed, 03 Oct 2007)
New Revision: 5258

Modified:
   xwiki-products/xwiki-enterprise/trunk/pom.xml
Log:
Preparing for XE 1.2M1 release again

Modified: xwiki-products/xwiki-enterprise/trunk/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/pom.xml   2007-10-03 15:50:06 UTC 
(rev 5257)
+++ xwiki-products/xwiki-enterprise/trunk/pom.xml   2007-10-03 15:51:10 UTC 
(rev 5258)
@@ -48,10 +48,10 @@
   
   
 
-1.7-SNAPSHOT
-1.2-SNAPSHOT
-1.2-SNAPSHOT
-1.2-SNAPSHOT
+1.6
+1.2-milestone-1
+1.2-milestone-1
+1.2-milestone-1
   
   
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5259 - xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XApp

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 17:53:32 +0200 (Wed, 03 Oct 2007)
New Revision: 5259

Modified:
   
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XApp/XWikiApplicationXem
Log:
* Set applications descriptors documents parent to XAppManager.WebHome

Modified: 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XApp/XWikiApplicationXem
===
--- 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XApp/XWikiApplicationXem
   2007-10-03 15:51:10 UTC (rev 5258)
+++ 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XApp/XWikiApplicationXem
   2007-10-03 15:53:32 UTC (rev 5259)
@@ -6,14 +6,14 @@
 
 en
 0
-XAppClasses.XWikiApplicationClass
+XAppManager.WebHome
 
 XWiki.Admin
 
 XWiki.Admin
 1188210368000
-118976844
-118976844
+1191425595000
+1191425595000
 1.2
 
 
@@ -269,5 +269,5 @@
 
 
 
-#includeForm("XAppSheets.XWikiApplicationClassSheet")
+#includeForm("XAppSheets.XWikiApplicationClassSheet")
 
\ No newline at end of file

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5260 - in xwiki-products/xwiki-enterprise/trunk: . database database/hsqldb distribution distribution/hsqldb distribution-test distribution-test/selenium-tests distribution-test

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 18:12:36 +0200 (Wed, 03 Oct 2007)
New Revision: 5260

Modified:
   xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/trunk/database/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml
   
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/windows/pom.xml
   xwiki-products/xwiki-enterprise/trunk/pom.xml
   xwiki-products/xwiki-enterprise/trunk/wiki/pom.xml
Log:
[maven-release-plugin] prepare release xwiki-enterprise-1.2-milestone-1

Modified: xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml   
2007-10-03 15:53:32 UTC (rev 5259)
+++ xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml   
2007-10-03 16:12:36 UTC (rev 5260)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-database
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-database-hsqldb
   XWiki Products - Enterprise - Database - HSQLDB

Modified: xwiki-products/xwiki-enterprise/trunk/database/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/database/pom.xml  2007-10-03 
15:53:32 UTC (rev 5259)
+++ xwiki-products/xwiki-enterprise/trunk/database/pom.xml  2007-10-03 
16:12:36 UTC (rev 5260)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-database
   XWiki Products - Enterprise - Database - Parent POM

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml   
2007-10-03 15:53:32 UTC (rev 5259)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml   
2007-10-03 16:12:36 UTC (rev 5260)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-hsqldb
   XWiki Products - Enterprise - Distribution - HSQLDB

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
15:53:32 UTC (rev 5259)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
16:12:36 UTC (rev 5260)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise
   XWiki Products - Enterprise - Distribution - Parent POM

Modified: xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml 
2007-10-03 15:53:32 UTC (rev 5259)
+++ xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml 
2007-10-03 16:12:36 UTC (rev 5260)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-test
   XWiki Products - Enterprise - Functional Tests

Modified: 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml
===
--- 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml  
2007-10-03 15:53:32 UTC (rev 5259)
+++ 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml  
2007-10-03 16:12:36 UTC (rev 5260)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-test
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-test-selenium
   XWiki Products - Enterprise - Functional Selenium Tests

Modified: 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
===
--- 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
2007-10-03 15:53:32 UTC (rev 5259)
+++ 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
2007-10-03 16:12:36 UTC (rev 5260)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-test
-1.2-SNAPSHOT
+1.2-milestone-1
   
   xwiki-enterprise-test-xmlrpc
   XWiki Products - Enterprise - Functional XMLRPC Tests

Modified: xwiki-products/xwiki-enterprise/trunk/instal

[xwiki-notifications] r5262 - in xwiki-products/xwiki-enterprise/trunk: . database database/hsqldb distribution distribution/hsqldb distribution-test distribution-test/selenium-tests distribution-test

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 18:12:59 +0200 (Wed, 03 Oct 2007)
New Revision: 5262

Modified:
   xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/trunk/database/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml
   
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/pom.xml
   xwiki-products/xwiki-enterprise/trunk/installers/windows/pom.xml
   xwiki-products/xwiki-enterprise/trunk/pom.xml
   xwiki-products/xwiki-enterprise/trunk/wiki/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration

Modified: xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml   
2007-10-03 16:12:49 UTC (rev 5261)
+++ xwiki-products/xwiki-enterprise/trunk/database/hsqldb/pom.xml   
2007-10-03 16:12:59 UTC (rev 5262)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-database
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-database-hsqldb
   XWiki Products - Enterprise - Database - HSQLDB

Modified: xwiki-products/xwiki-enterprise/trunk/database/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/database/pom.xml  2007-10-03 
16:12:49 UTC (rev 5261)
+++ xwiki-products/xwiki-enterprise/trunk/database/pom.xml  2007-10-03 
16:12:59 UTC (rev 5262)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-database
   XWiki Products - Enterprise - Database - Parent POM

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml   
2007-10-03 16:12:49 UTC (rev 5261)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/hsqldb/pom.xml   
2007-10-03 16:12:59 UTC (rev 5262)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-hsqldb
   XWiki Products - Enterprise - Distribution - HSQLDB

Modified: xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
16:12:49 UTC (rev 5261)
+++ xwiki-products/xwiki-enterprise/trunk/distribution/pom.xml  2007-10-03 
16:12:59 UTC (rev 5262)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise
   XWiki Products - Enterprise - Distribution - Parent POM

Modified: xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml 
2007-10-03 16:12:49 UTC (rev 5261)
+++ xwiki-products/xwiki-enterprise/trunk/distribution-test/pom.xml 
2007-10-03 16:12:59 UTC (rev 5262)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-parent
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-test
   XWiki Products - Enterprise - Functional Tests

Modified: 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml
===
--- 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml  
2007-10-03 16:12:49 UTC (rev 5261)
+++ 
xwiki-products/xwiki-enterprise/trunk/distribution-test/selenium-tests/pom.xml  
2007-10-03 16:12:59 UTC (rev 5262)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-test
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-test-selenium
   XWiki Products - Enterprise - Functional Selenium Tests

Modified: 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
===
--- 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
2007-10-03 16:12:49 UTC (rev 5261)
+++ 
xwiki-products/xwiki-enterprise/trunk/distribution-test/xmlrpc-tests/pom.xml
2007-10-03 16:12:59 UTC (rev 5262)
@@ -3,7 +3,7 @@
   
 com.xpn.xwiki.products
 xwiki-enterprise-test
-1.2-milestone-1
+1.2-SNAPSHOT
   
   xwiki-enterprise-test-xmlrpc
   XWiki Products - Enterprise - Functional XMLRPC Tests

Modified: xwiki-products/xwiki-enterprise/trunk/installers/gener

[xwiki-notifications] r5263 - xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 18:18:42 +0200 (Wed, 03 Oct 2007)
New Revision: 5263

Modified:
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
Log:
Hide the "docsToLink" feature as it is not implemented yet

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
  2007-10-03 16:12:59 UTC (rev 5262)
+++ 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
  2007-10-03 16:18:42 UTC (rev 5263)
@@ -229,6 +229,7 @@
 setListValue(XWikiApplicationClass.FIELD_docstoinclude, docstoinclude);
 }
 
+/* TODO : add support for real linked documents in xwiki-core to be able 
to use it 
 public List getDocsToLink()
 {
 return getListValue(XWikiApplicationClass.FIELD_docstolink);
@@ -238,6 +239,7 @@
 {
 setListValue(XWikiApplicationClass.FIELD_docstolink, docstolink);
 }
+*/
 
 /**
  * @return the list of documents containing translations strings.
@@ -509,7 +511,9 @@
 return docsToInclude;
 }
 
-/**
+/*
+ * TODO : add support for real linked documents in xwiki-core to be able 
to use it 
+ * 
  * Get and resolve all documents names to link application contains.
  * 
  * For each of these documents names, if are between "[" and "]", are 
considered as SQL matching
@@ -523,8 +527,9 @@
  * @see #getDocsToLink()
  * @see XWikiApplicationClass#FIELD_docstolink
  */
+/* TODO : add support for real linked documents in xwiki-core to be able 
to use it 
 public Set getDocsNameToLink(boolean recurse, XWikiContext context) throws 
XWikiException
 {
 return getDocsNameSet(XWikiApplicationClass.FIELD_docstolink, recurse, 
false, context);
-}
+}*/
 }

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
 2007-10-03 16:12:59 UTC (rev 5262)
+++ 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
 2007-10-03 16:18:42 UTC (rev 5263)
@@ -262,6 +262,7 @@
 needsUpdate = true;
 }
 
+/* TODO : add support for real linked documents in xwiki-core to be 
able to use it 
 if (baseClass.addStaticListField(FIELD_docstolink, FIELDPN_docstolink, 
80, true, "",
 "input")) {
 
@@ -274,6 +275,7 @@
 
 needsUpdate = true;
 }
+*/
 
 if (baseClass.addStaticListField(FIELD_translationdocs, 
FIELDPN_translationdocs, 80,
 true, "", "input")) {

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5264 - xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 18:18:57 +0200 (Wed, 03 Oct 2007)
New Revision: 5264

Modified:
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
Log:
Hide the "docsToLink" feature as it is not implemented yet

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
===
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2007-10-03 16:18:42 UTC (rev 5263)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2007-10-03 16:18:57 UTC (rev 5264)
@@ -28,8 +28,10 @@
 
 
#foreach($prop in $class.properties) -
${prop.prettyName}
-
$doc.display($prop.getName())
+#if($prop.name != "docstolink") +
${prop.prettyName}
+
$doc.display($prop.getName())
+#end #end
\ No newline at end of file ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5265 - xwiki-products/xwiki-enterprise/trunk

2007-10-03 Thread SVN
Author: vmassol
Date: 2007-10-03 18:29:03 +0200 (Wed, 03 Oct 2007)
New Revision: 5265

Modified:
   xwiki-products/xwiki-enterprise/trunk/pom.xml
Log:
Continue work for XE 1.2M2

Modified: xwiki-products/xwiki-enterprise/trunk/pom.xml
===
--- xwiki-products/xwiki-enterprise/trunk/pom.xml   2007-10-03 16:18:57 UTC 
(rev 5264)
+++ xwiki-products/xwiki-enterprise/trunk/pom.xml   2007-10-03 16:29:03 UTC 
(rev 5265)
@@ -27,7 +27,7 @@
   
 com.xpn.xwiki.platform
 xwiki
-5
+6-SNAPSHOT
 ../xwiki-platform-pom
   
   com.xpn.xwiki.products
@@ -48,10 +48,10 @@
   
   
 
-1.6
-1.2-milestone-1
-1.2-milestone-1
-1.2-milestone-1
+1.7-SNAPSHOT
+1.2-SNAPSHOT
+1.2-SNAPSHOT
+1.2-SNAPSHOT
   
   
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5266 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels

2007-10-03 Thread SVN
Author: dward
Date: 2007-10-03 18:31:01 +0200 (Wed, 03 Oct 2007)
New Revision: 5266

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorFilterPanel.java
Log:
- CURRIKI-1029
 - Move filter select box over.

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorFilterPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorFilterPanel.java
2007-10-03 16:29:03 UTC (rev 5265)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorFilterPanel.java
2007-10-03 16:31:01 UTC (rev 5266)
@@ -84,7 +84,7 @@
 
 g.setWidget(3, 0, sFileType);
 //g.setWidget(3, 1, sLanguage);
-g.setWidget(3, 2, sSpecial);
+g.setWidget(3, 1, sSpecial);
 
 add(g);
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5267 - xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemResources

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 19:03:14 +0200 (Wed, 03 Oct 2007)
New Revision: 5267

Modified:
   
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemResources/Translations
Log:
Add {table} and reorganize a little XemResources.Translations to be easier to 
read.

Modified: 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemResources/Translations
===
--- 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemResources/Translations
  2007-10-03 16:31:01 UTC (rev 5266)
+++ 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemResources/Translations
  2007-10-03 17:03:14 UTC (rev 5267)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1188311598000
-1190049152000
-1190049152000
-1.3
+1191430646000
+1191430646000
+1.5
 
 
 
@@ -53,15 +53,17 @@
 
 
 
-11. MESSAGE
+{table}
+xem.xem=XWiki Enterprise Manager
 
+# MESSAGES
 xem.install.success=Xem installation success.
 xem.install.error=Xem installation failed ({0}).
 xem.install.noneed=No action needed.
 
-11. ANSWERS
-
+# ANSWERS
 xem.answer.install.title=Xem installation
 xem.answer.install.actions=To complete installation Xem will :\n
-xem.answer.install.actions.template=- Add default template
+xem.answer.install.actions.template=* Add default template
+{table}
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5268 - xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager

2007-10-03 Thread SVN
Author: tmortagne
Date: 2007-10-03 19:06:21 +0200 (Wed, 03 Oct 2007)
New Revision: 5268

Modified:
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
Log:
* Some javadoc correction
* Fix use of Collection.EMPTY_LIST in place of new ArrayList() introduced in 
XAWM-4

Modified: 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
 2007-10-03 17:03:14 UTC (rev 5267)
+++ 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
 2007-10-03 17:06:21 UTC (rev 5268)
@@ -565,7 +565,7 @@
  * "template".
  * 
  * @param context the XWiki context.
- * @return a list of XWikiServer.
+ * @return a list of XWikiDocuments.
  * @throws XWikiException
  */
 public List getWikiTemplateList(XWikiContext context) throws XWikiException

Modified: 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
2007-10-03 17:03:14 UTC (rev 5267)
+++ 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
2007-10-03 17:06:21 UTC (rev 5268)
@@ -28,6 +28,7 @@
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -296,7 +297,7 @@
  */
 public List getWikiTemplateList() throws XWikiException
 {
-List listDocument = Collections.EMPTY_LIST;
+List listDocument = new ArrayList();
 
 try {
 List listXWikiDocument = 
WikiManager.getInstance().getWikiTemplateList(this.context);

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5269 - in xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources: Main XWiki

2007-10-03 Thread SVN
Author: jvdrean
Date: 2007-10-03 19:26:41 +0200 (Wed, 03 Oct 2007)
New Revision: 5269

Modified:
   
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Main/LuceneSearch
   xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Results
Log:
XE-97 : Improve Lucene Search page to be as good as the default search

fixed :
* Add space selection as for the default search 
* Add RSS feeds on search query as for the default search 
* Missing page titles in the results list as for the default list
* Remove filter for score
* Velocity errors/warns to remove when clicking on the Rebuild button 

Modified: 
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Main/LuceneSearch
===
--- 
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Main/LuceneSearch 
2007-10-03 17:06:21 UTC (rev 5268)
+++ 
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Main/LuceneSearch 
2007-10-03 17:26:41 UTC (rev 5269)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1186588178000
-1186942604000
-1186942604000
-1.2
+1191330909000
+1191330909000
+45.1
 
 
 
@@ -25,8 +25,8 @@
 next.png
 395
 XWiki.Admin
-1186927318000
-1.1
+1191242195000
+1.2
 
 
iVBORw0KGgoNSUhEUgAAABAQCAYf8/9hBGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEdSURBVDjLY/j//z8DJZiB6gY0rH7xpW7li3YKDHj1v2bli38lix61k2VA5fJn/9eeeP+/fcOL/wlT7/aRbEDegkf/Vxx/93/xobf/S5c8/u/ecm0eSQYkTX/4f+HBN/8nbX/xf+bul/8Tp9/9r1N0dgnRBgT33QZqfPW/YdXj/42rH//v2vjkv3fHtf9SScceEWWAc8u1/xO2Pv9fsvjB//IlD4CGPPrvXH/5v2Tksc1EGWBaful/+/on/4sW3gfGxsP/9lUX/ksEH1gj6rqdhSgDlPPO/q9b8fB/5bIH/23LL/wXD9i7kqRAlEo6+b908f3/NiXn/4t57V1EcjRKRB75b1145r+o684FZCUkMb8D/0Uct88euMxEKgYA7Ojrv4CgE7EASUVORK5CYII=
 
@@ -34,8 +34,8 @@
 previous.png
 389
 XWiki.Admin
-1186927329000
-1.1
+1191242195000
+1.2
 
 
iVBORw0KGgoNSUhEUgAAABAQCAYf8/9hBGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEXSURBVDjLY/j//z8DJZiBLgZkz37Ynjrz4ReyDEideb89afrDf5ET7v4n2YCEqXf7qpY9/T9r76v/Xu03STMgasLteaVLHv+fufvl/6k7X/y3qrlCvAHBvTeXFC54ANbctv7p/95Nz/5rFZ0nzoCAzpuPsuc++D91x4v/jasf/y9aeP9/89rH/6VTTxJngGPDtc3xU+/879789H/5kgf/02fd+V+17OF/yZhjxBmgVXCaRT3v7BqP1mv/a1Y+/J824/b/woX3/osHHSAtECVjjqy0Lb/wP2/+3f+Zs+/8F3XfS3o0inntXWSeffJ/0tRb/0Ucdv4nKyEJW25ZYBh/5L+w5fb/ZCdlQYMNs4WMt/wfuMyEDwMA0Irn/pDRT58ASUVORK5CYII=
 
@@ -78,24 +78,83 @@
 ## Inputs : $request.text
 ## Outputs : $list, $isScored
 ## ===
-
+{pre}
+#set ($displayUI = true)
+#if ($request.xpage && $request.xpage == "rdf")
+  #set ($displayUI = false)
+#end
+## ---
+## Title
+## ---
+#if ($displayUI)
+{/pre}
 1 Search
-
-#set($query = $request.getParameter("text"))
+{pre}
+#end
+## ---
+## Space filtering
+## ---
+#if($request.space && $request.space != "")
+  #set($space = $request.space)
+  #set($reqspace = "AND web:${space}")
+#else
+  #set($space = "")
+#end
+#set($spacesText = {})
+#set($spaces = $xwiki.spaces)
+#set($ok = $spacesText.put("All",""))
+#foreach($space in $spaces)
+  #set($ok = $spacesText.put($space,$space))
+#end
+## ---
+## Space macros
+## ---
+#macro(spaceoption $space $selectspace $spacesText)
+  
+#end
+#macro(spaceselect $selectspace $spaces $spacesText)
+  
+#end
+## ---
+## Query preparation
+## ---
+#set($text = $request.getParameter("text"))
+#set($query = $text)
 #if(!$query)
#set($query = "")
 #end
 #set($itemsPerPage = "30")
-
-{pre}
-
-
- - +## --- +## RSS link +## --- +#set($utext = $xwiki.getURLEncoded($query)) +#if($space == "") + #set($url = $xwiki.getURL($doc.fullName, "view", "xpage=rdf&text=${utext}" )) +#else + #set($url = $xwiki.getURL($doc.fullName, "view", "xpage=rdf&space=$space&text=${utext}")) +#end +#if ($displayUI) +
+ rss icon
+## --- +## Query form +## --- + +
+Query in space #spaceselect($space $spaces $spacesText) +
+#end {/pre} - +## --- +## Results processing +## --- #if($query != "") #set($lucene = $xwiki.getPlugin("lucene")) #if($lucene) @@ -108,22 +167,24 @@ #if(!$firstIndex) #set($fi

[xwiki-notifications] r5270 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-03 Thread SVN
Author: dward
Date: 2007-10-03 19:59:16 +0200 (Wed, 03 Oct 2007)
New Revision: 5270

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/header.vm
Log:
- CURRIKI-1022
 - #__terms= now only gets added once

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/header.vm
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/header.vm   
2007-10-03 17:26:41 UTC (rev 5269)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/header.vm   
2007-10-03 17:59:16 UTC (rev 5270)
@@ -96,7 +96,7 @@
  
- $msg.get("header.search_go")
+ $msg.get("header.search_go")
  ## curriki-search-field
  ## curriki-search-field-container


___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5271 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-03 Thread SVN
Author: dward
Date: 2007-10-03 20:11:46 +0200 (Wed, 03 Oct 2007)
New Revision: 5271

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/header.vm
Log:
- CURRIKI-1025
 - Change the page URL instead of submitting a form to keep from getting the 
"POST data expired" message

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/header.vm
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/header.vm   
2007-10-03 17:59:16 UTC (rev 5270)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/header.vm   
2007-10-03 18:11:46 UTC (rev 5271)
@@ -85,7 +85,7 @@
  
   
$msg.get("header.find_resource")
-   
+   
 
 
  

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5272 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels

2007-10-03 Thread SVN
Author: dward
Date: 2007-10-03 22:50:04 +0200 (Wed, 03 Oct 2007)
New Revision: 5272

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
Log:
- CURRIKI-1033
 - Initialize sortBy value.

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-03 18:11:46 UTC (rev 5271)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-03 20:50:04 UTC (rev 5272)
@@ -65,7 +65,7 @@
 protected int columnCount = 4;
 protected int curRow = 0;
 protected Selectable selector;
-protected String sortBy;
+protected String sortBy = "";
 protected ClickListener cancelCallback;
 protected Viewer viewer;
 protected ResourceAdder resourceAdder;

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5273 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-03 Thread SVN
Author: ludovic
Date: 2007-10-03 23:42:38 +0200 (Wed, 03 Oct 2007)
New Revision: 5273

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
Log:
CURRIKI-998 direction block appears to remove assets/folders below it when 
looking at Collection in View

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-03 20:50:04 UTC (rev 5272)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-03 21:42:38 UTC (rev 5273)
@@ -1147,6 +1147,7 @@
  
#else
 #set($embeddedDoc = $xwiki.getDocument($assetPage))
+#set($type = "")
 #set($type = $!embeddedDoc.getValue("type", 
$embeddedDoc.getObject("XWiki.TextAssetClass")))
 #if("$type"=="2")
 ## We are not showing direction block assets

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5274 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-03 Thread SVN
Author: ludovic
Date: 2007-10-04 00:19:43 +0200 (Thu, 04 Oct 2007)
New Revision: 5274

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
Log:
CURRIKI-1037 TOC looses tree when Comments selected in View

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-03 21:42:38 UTC (rev 5273)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-03 22:19:43 UTC (rev 5274)
@@ -845,11 +845,11 @@
 $bentrydoc.getRenderedContent($content) #if($bentrydoc.fullName != 
$doc.fullName || !$displayFully)
 
 
-$msg.get("caption.readmore")#end
+$msg.get("caption.readmore")#end
 
 
 
-$msg.get("myBlog.postedBy", [$xwiki.getLocalUserName($bentrydoc.creator), 
$creationDay, $creationHour]) #sep() [$bentrydoc.comments.size() 
$msg.get("caption.comment")(s)>#if($bentrydoc.fullName != 
$doc.fullName)${bentrydoc.fullName}?bc=$!{bcLocal}#end#comments]
+$msg.get("myBlog.postedBy", [$xwiki.getLocalUserName($bentrydoc.creator), 
$creationDay, $creationHour]) #sep() [$bentrydoc.comments.size() 
$msg.get("caption.comment")(s)>#if($bentrydoc.fullName != 
$doc.fullName)${bentrydoc.fullName}?bc=$!{request.bc}#end#comments]
 
 
 ## $msg.get("caption.sendToAFriend")
@@ -1066,9 +1066,9 @@
 
 
 #if($request.showMeta == true)
-$msg.get("asset.closeMoreInformation")
+$msg.get("asset.closeMoreInformation")
 #else
-$msg.get("asset.moreInformation")
+$msg.get("asset.moreInformation")
 #end
 
  ## asset-metadatas-block
@@ -1234,7 +1234,7 @@
 
 
 *$msg.get("colls.description")* $!collDoc.description
-$msg.get("caption.view") 
#if($collDoc.hasAccessLevel("edit"))
+$msg.get("caption.view") 
#if($collDoc.hasAccessLevel("edit"))
 #sep() $msg.get("caption.edit")
 #end
 #if("XWiki.${shortname}" == $context.user || $xwiki.hasAdminRights() || 
$xwiki.checkAccess($collDoc.fullName, "delete"))

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5275 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors

2007-10-03 Thread SVN
Author: dward
Date: 2007-10-04 00:26:46 +0200 (Thu, 04 Oct 2007)
New Revision: 5275

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors/SpecialFilterSelector.java
Log:
- CURRIKI-1032
 - Add filter to only show reviewed items

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors/SpecialFilterSelector.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors/SpecialFilterSelector.java
   2007-10-03 22:19:43 UTC (rev 5274)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors/SpecialFilterSelector.java
   2007-10-03 22:26:46 UTC (rev 5275)
@@ -39,6 +39,7 @@
 addOption(Main.getTranslation("search.selector.filters.mine"), 
"mine");
 }
 addOption(Main.getTranslation("search.selector.filters.collections"), 
"collections");
+addOption(Main.getTranslation("search.selector.filters.reviewed"), 
"reviewed");
 }
 
 public Widget getLabel()
@@ -57,6 +58,9 @@
 if (value.equals("collections")){
 filter = "XWiki.CompositeAssetClass.type:collection";
 }
+if (value.equals("reviewed")){
+filter = "CRS.CurrikiReviewStatusClass.status:(1 OR 2 OR 3 OR 
P)";
+}
 if (value.equals("mine")){
 filter = 
"creator:"+Main.getSingleton().getUser().getFullName(); // This is the full 
USERNAME, not realname
 }

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5276 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns

2007-10-03 Thread SVN
Author: dward
Date: 2007-10-04 00:38:39 +0200 (Thu, 04 Oct 2007)
New Revision: 5276

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ReviewColumn.java
Log:
- CURRIKI-1032
 - Change field that we use for Review sorting.

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ReviewColumn.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ReviewColumn.java
  2007-10-03 22:26:46 UTC (rev 5275)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ReviewColumn.java
  2007-10-03 22:38:39 UTC (rev 5276)
@@ -47,7 +47,7 @@
 {
 this.header = Main.getTranslation("search.results.col.review");
 this.columnStyle = "results-review-cell";
-this.sortBy = 
Constants.CURRIKI_REVIEW_CLASS+"."+Constants.CURRIKI_REVIEW_RATING_PROPERTY;
+this.sortBy = 
Constants.CURRIKI_REVIEW_STATUS_CLASS+"."+Constants.CURRIKI_REVIEW_STATUS_STATUS;
 }
 
 public ReviewColumn(String header, String columnStyle)

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5277 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels

2007-10-03 Thread SVN
Author: dward
Date: 2007-10-04 01:39:54 +0200 (Thu, 04 Oct 2007)
New Revision: 5277

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
Log:
- CURRIKI-1033
 - Action column was causing problems with sort issues.

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-03 22:38:39 UTC (rev 5276)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-03 23:39:54 UTC (rev 5277)
@@ -166,7 +166,7 @@
 if (w instanceof SortableColumnHeader){
 SortableColumnHeader sw = (SortableColumnHeader) w;
 
-if (sw.getSortBy().equals(sortBy)){
+if (sortBy != null && !sortBy.equals("") && sw.getSortBy() != 
null && sw.getSortBy().equals(sortBy)){
 g.getFlexCellFormatter().addStyleName(curRow, i, 
"find-results-column-header-sorted");
 } else {
 g.getFlexCellFormatter().removeStyleName(curRow, i, 
"find-results-column-header-sorted");

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5278 - xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog

2007-10-04 Thread SVN
Author: vmassol
Date: 2007-10-04 11:34:19 +0200 (Thu, 04 Oct 2007)
New Revision: 5278

Modified:
   xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
Log:
XE-132: Prev/Next links don't work
Submitted by Marius Florea

Modified: 
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
===
--- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros   
2007-10-03 23:39:54 UTC (rev 5277)
+++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros   
2007-10-04 09:34:19 UTC (rev 5278)
@@ -68,8 +68,6 @@
 #set($inbitems = $xwiki.parseInt($nbitems))
 #set($inbstart = $xwiki.parseInt($nbstart))
 #foreach ($item in $xwiki.searchDocuments($sql, $inbitems, $inbstart))
-## The default foreach counter, $velocityCount, cannot be used outside of the 
foreach body!
-#set($velocityCountOutsideForeachBody = $velocityCount)
 #set($bentrydoc = $xwiki.getDocument($item))
 #if($bentrydoc.fullName == $item)
 #set($bentryobj = $bentrydoc.getObject("XWiki.ArticleClass"))
@@ -103,15 +101,19 @@
 #end
 ##
 ## prev/next links
-#if(($inbstart != 0) || ($velocityCountOutsideForeachBody==$inbitems))
+#if (!$velocityCount)
+## if $velocityCount has not been initialized (e.g. $xwiki.searchDocuments has 
returned an empty list)
+#set($velocityCount = -1)
+#end
+#if(($inbstart != 0) || ($velocityCount==$inbitems))
  ## pagingLinks

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5279 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources

2007-10-04 Thread SVN
Author: tmortagne
Date: 2007-10-04 11:56:06 +0200 (Thu, 04 Oct 2007)
New Revision: 5279

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
Log:
XAWM-10 : Translation corrections
Also clean up useless strings.

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
  2007-10-04 09:34:19 UTC (rev 5278)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
  2007-10-04 09:56:06 UTC (rev 5279)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1186671807000
-1191339526000
-1191339526000
-1.13
+1191491461000
+1191491461000
+1.17
 
 
 
@@ -56,26 +56,7 @@
 {table}
 wikimanager.wikimanager=Wiki Manager
 
-wikimanager.checkall=Check all
-wikimanager.uncheckall=Uncheck all
-wikimanager.nouserforthisletter=There is nobody whose name starts with this 
letter
-wikimanager.addselectedusertolist=Add
 wikimanager.wikinameneeded=A name for the wiki is necessary
-wikimanager.wikidescneeded=A description for the wiki is necessary
-wikimanager.wikiadminneeded=A administrator for the wiki is necessary
-wikimanager.wikitemplateneeded=A template for the wiki is necessary
-wikimanager.wikivisibilityneeded=A visibility parameter for the wiki is 
necessary
-wikimanager.search=Search
-wikimanager.createuser=Create a new user
-wikimanager.userfirstname=First name
-wikimanager.userlastname=Last name
-wikimanager.userlogin=User login
-wikimanager.useremail=e-Mail adress
-wikimanager.submitlabelcreateuser=Create user
-wikimanager.userfirstnameneeded=A user's first name is needed
-wikimanager.userlastnameneeded=A user's last name is needed
-wikimanager.userloginneeded=A user's login is needed
-wikimanager.useremailneeded=A user's e-Mail is needed
 
 # LABELS
 
@@ -83,11 +64,12 @@
 wikimanager.totalnumberofwiki=Total number of wiki
 wikimanager.wikiname=Wiki name
 wikimanager.wikidesc=Description
+wikimanager.wikidomain=Domain
 wikimanager.wikiadmin=Administrator
 wikimanager.wikivisibility=Visibility
 wikimanager.wikistate=State
 wikimanager.wikitemplate=From wiki template
-wikimanager.wikipackage=From package
+wikimanager.wikipackage=From package (attached file)
 wikimanager.listwikiname=Name
 wikimanager.listwikirank=Rank
 wikimanager.listwikiadmin=Admin
@@ -124,7 +106,7 @@
 wikimanager.errordeletewiki=Wiki \"{0}\" delete failed with error code \"{1}\".
 wikimanager.successsetvisibility=Wiki \"{0}\" visibility changed to \"{1}\".
 wikimanager.errorsetvisibility=Wiki \"{0}' visibility changing failed with 
error code \"{1}\".
-wikimanager.successscreatewiki=Your wiki \"{0}\" has been created. You can 
access it at the following address: http://{1}.
+wikimanager.successcreatewiki=Your wiki \"{0}\" has been created. You can 
access it at the following address: http://{1}.
 wikimanager.errorcreatewiki=Wiki \"{0}\" creation failed with error code 
\"{1}\".
 wikimanager.errorcreatewiki.ERROR_WIKIMANAGER_WIKISERVER_ALREADY_EXISTS=This 
wiki \"{0}\" already exist. Please choose another name.
 wikimanager.listwikiempty=There are no open wikis.

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5280 - in xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse: META-INF src/main/java/org/xwiki/plugins/eclipse/views/navigator

2007-10-04 Thread SVN
Author: vmassol
Date: 2007-10-04 13:44:30 +0200 (Thu, 04 Oct 2007)
New Revision: 5280

Modified:
   
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/META-INF/MANIFEST.MF
   
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/views/navigator/XWikiNavigator.java
Log:
XECLIPSE-27: Better integration of XWiki Eclipse with RCP Applications and the 
Eclipse ecosystem
Patch submitted by Fabio Mancinelli

Modified: 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/META-INF/MANIFEST.MF
===
--- 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/META-INF/MANIFEST.MF
 2007-10-04 09:56:06 UTC (rev 5279)
+++ 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/META-INF/MANIFEST.MF
 2007-10-04 11:44:30 UTC (rev 5280)
@@ -18,3 +18,4 @@
  org.eclipse.ui.ide,
  org.eclipse.ui.workbench.texteditor
 Eclipse-LazyStart: true
+Export-Package: org.xwiki.plugins.eclipse.model

Modified: 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/views/navigator/XWikiNavigator.java
===
--- 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/views/navigator/XWikiNavigator.java
  2007-10-04 09:56:06 UTC (rev 5279)
+++ 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/views/navigator/XWikiNavigator.java
  2007-10-04 11:44:30 UTC (rev 5280)
@@ -122,6 +122,7 @@
 viewer.setContentProvider(new XWikiNavigatorContentProvider());
 viewer.setLabelProvider(new XWikiNavigatorLabelProvider());
 viewer.setInput(getViewSite());
+getSite().setSelectionProvider(viewer);
 makeActions();
 hookContextMenu();
 hookDoubleClickAction();

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5281 - in xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search: columns panels

2007-10-04 Thread SVN
Author: dward
Date: 2007-10-04 17:37:49 +0200 (Thu, 04 Oct 2007)
New Revision: 5281

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ResultsColumn.java
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
Log:
- CURRIKI-1007
 - Add mouse-over style to column headers when the mouse enters, and remove 
when it leaves.

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ResultsColumn.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ResultsColumn.java
 2007-10-04 11:44:30 UTC (rev 5280)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/columns/ResultsColumn.java
 2007-10-04 15:37:49 UTC (rev 5281)
@@ -68,8 +68,11 @@
 
 public Widget getHeaderWidget()
 {
-SortableColumnHeader h = new SortableColumnHeader(header, sortBy);
-return h;
+if (sortBy != null && !sortBy.equals("")){
+return new SortableColumnHeader(header, sortBy);
+} else {
+return new Label(header);
+}
 }
 
 public String getColumnStyle()

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-04 11:44:30 UTC (rev 5280)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-04 15:37:49 UTC (rev 5281)
@@ -31,6 +31,7 @@
 import com.google.gwt.user.client.ui.SourcesTableEvents;
 import com.google.gwt.user.client.ui.TableListener;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.MouseListenerAdapter;
 import com.xpn.xwiki.gwt.api.client.Document;
 import org.curriki.gwt.client.Constants;
 import org.curriki.gwt.client.Main;
@@ -69,6 +70,7 @@
 protected ClickListener cancelCallback;
 protected Viewer viewer;
 protected ResourceAdder resourceAdder;
+protected hoverOnMouseover hoverMarker = new hoverOnMouseover();
 
 public ResultsPanel(){
 init(false);
@@ -166,10 +168,14 @@
 if (w instanceof SortableColumnHeader){
 SortableColumnHeader sw = (SortableColumnHeader) w;
 
-if (sortBy != null && !sortBy.equals("") && sw.getSortBy() != 
null && sw.getSortBy().equals(sortBy)){
-g.getFlexCellFormatter().addStyleName(curRow, i, 
"find-results-column-header-sorted");
-} else {
-g.getFlexCellFormatter().removeStyleName(curRow, i, 
"find-results-column-header-sorted");
+if (sw != null && sw.getSortBy() != null && 
!sw.getSortBy().equals("")){
+sw.addMouseListener(hoverMarker);
+
+if (sortBy != null && !sortBy.equals("") && 
sw.getSortBy().equals(sortBy)){
+g.getFlexCellFormatter().addStyleName(curRow, i, 
"find-results-column-header-sorted");
+} else {
+g.getFlexCellFormatter().removeStyleName(curRow, i, 
"find-results-column-header-sorted");
+}
 }
 }
 g.setWidget(curRow, i, w);
@@ -308,4 +314,14 @@
 columnCount = 5;
 }
 }
+
+public class hoverOnMouseover extends MouseListenerAdapter {
+public void onMouseEnter(Widget w){
+w.addStyleName("mouse-over");
+}
+
+public void onMouseLeave(Widget w){
+w.removeStyleName("mouse-over");
+}
+}
 }

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5286 - xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc

2007-10-04 Thread SVN
Author: tmortagne
Date: 2007-10-04 17:48:36 +0200 (Thu, 04 Oct 2007)
New Revision: 5286

Modified:
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
Log:
"Unhide" docsToLink list to be used with #includeTopic velocity macro.

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
  2007-10-04 15:47:26 UTC (rev 5285)
+++ 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
  2007-10-04 15:48:36 UTC (rev 5286)
@@ -221,7 +221,7 @@
  * wiki template.
  * 
  * @param docstoinclude the new list of document application contains that 
will be included in
- *place of copy from wiki template.
+ *place of copy from a wiki template.
  * @see #getDocsToInclude()
  */
 public void setDocsToInclude(List docstoinclude)
@@ -229,17 +229,28 @@
 setListValue(XWikiApplicationClass.FIELD_docstoinclude, docstoinclude);
 }
 
-/* TODO : add support for real linked documents in xwiki-core to be able 
to use it 
+/**
+ * @return the list of document application contains that will be linked 
in place of copy from a
+ * wiki template.
+ * @see #setDocsToLink(List)
+ */
 public List getDocsToLink()
 {
 return getListValue(XWikiApplicationClass.FIELD_docstolink);
 }
 
+/**
+ * Modify the list of document application contains that will be included 
in place of copy from
+ * wiki template.
+ * 
+ * @param docstolink the new list of document application contains that 
will be linked in place
+ *of copy from a wiki template.
+ * @see #getDocsToLink()
+ */
 public void setDocsToLink(List docstolink)
 {
 setListValue(XWikiApplicationClass.FIELD_docstolink, docstolink);
 }
-*/
 
 /**
  * @return the list of documents containing translations strings.
@@ -493,7 +504,7 @@
  * @param applications the applications containing documents names to 
resolve and add to
  *docsNames.
  * @param recurse if true it follow recursively all applications 
dependencies, if false parse
- *only direct dependencies.
+ *only provided applications.
  * @param context the XWiki context.
  * @return all documents names to include applications 
contains.
  * @throws XWikiException
@@ -511,9 +522,7 @@
 return docsToInclude;
 }
 
-/*
- * TODO : add support for real linked documents in xwiki-core to be able 
to use it 
- * 
+/**
  * Get and resolve all documents names to link application contains.
  * 
  * For each of these documents names, if are between "[" and "]", are 
considered as SQL matching
@@ -527,9 +536,36 @@
  * @see #getDocsToLink()
  * @see XWikiApplicationClass#FIELD_docstolink
  */
-/* TODO : add support for real linked documents in xwiki-core to be able 
to use it 
 public Set getDocsNameToLink(boolean recurse, XWikiContext context) throws 
XWikiException
 {
 return getDocsNameSet(XWikiApplicationClass.FIELD_docstolink, recurse, 
false, context);
-}*/
+}
+
+/**
+ * Get and resolve all documents names to link applications 
XWikiApplication list
+ * contains.
+ * 
+ * For each of these documents names, if are between "[" and "]", are 
considered as SQL matching
+ * string to use with "like".
+ * 
+ * @param applications the applications containing documents names to 
resolve and add to
+ *docsNames.
+ * @param recurse if true it follow recursively all applications 
dependencies, if false parse
+ *only provided applications.
+ * @param context the XWiki context.
+ * @return all documents names to link applications contains.
+ * @throws XWikiException
+ * @see #getDocsToLink()
+ * @see XWikiApplicationClass#FIELD_docstolink
+ */
+public static Set getDocsNameToLink(Collection applications, boolean 
recurse,
+XWikiContext context) throws XWikiException
+{
+Set docsToLink = new HashSet();
+
+resolveApplicationsDocsNames(docsToLink, applications,
+XWikiApplicationClass.FIELD_docstolink, false, context);
+
+return docsToLink;
+}
 }

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication

[xwiki-notifications] r5284 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons

2007-10-04 Thread SVN
Author: dward
Date: 2007-10-04 17:45:50 +0200 (Thu, 04 Oct 2007)
New Revision: 5284

Added:
   
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/arrow-red.png
Log:
- CURRIKI-1039
 - Red Right arrow for TOC


Added: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/arrow-red.png
===
(Binary files differ)


Property changes on: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/arrow-red.png
___
Name: svn:mime-type
   + application/octet-stream

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5282 - xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets

2007-10-04 Thread SVN
Author: tmortagne
Date: 2007-10-04 17:44:34 +0200 (Thu, 04 Oct 2007)
New Revision: 5282

Modified:
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
Log:
"Unhide" docsToLink list to be used with #includeTopic velocity macro.

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
===
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2007-10-04 15:37:49 UTC (rev 5281)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2007-10-04 15:44:34 UTC (rev 5282)
@@ -28,10 +28,8 @@
 
 
#foreach($prop in $class.properties) -#if($prop.name != "docstolink") -
${prop.prettyName}
-
$doc.display($prop.getName())
-#end +
${prop.prettyName}
+
$doc.display($prop.getName())
#end
\ No newline at end of file ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5283 - xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode

2007-10-04 Thread SVN
Author: tmortagne
Date: 2007-10-04 17:45:26 +0200 (Thu, 04 Oct 2007)
New Revision: 5283

Modified:
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
Log:
XAAM-6: Fix mix up between "recurse" and "recursive" words.

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
===
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
   2007-10-04 15:44:34 UTC (rev 5282)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
   2007-10-04 15:45:26 UTC (rev 5283)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1190905378000
-119091967
-119091967
-1.25
+1191512138000
+1191512138000
+1.28
 
 
 
@@ -81,7 +81,7 @@
 
 
 
-
+
#xwikimessageboxsubmit($msg.get("ok")) ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5285 - xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager

2007-10-04 Thread SVN
Author: tmortagne
Date: 2007-10-04 17:47:26 +0200 (Thu, 04 Oct 2007)
New Revision: 5285

Modified:
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
Log:
XAWM-11: Temporary implement "docsToLink" applicationManager feature using 
"#includeTopic" velocity macro.

Modified: 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
 2007-10-04 15:45:50 UTC (rev 5284)
+++ 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
 2007-10-04 15:47:26 UTC (rev 5285)
@@ -184,26 +184,55 @@
 
 return docsToInclude;
 }
+
+private Collection getDocsNameToLink(String wiki, XWikiContext context) 
throws XWikiException
+{
+// Get applications manger
+ApplicationManagerPluginApi appmanager =
+(ApplicationManagerPluginApi) context.getWiki().getPluginApi(
+ApplicationManagerPlugin.PLUGIN_NAME, context);
 
+if (appmanager == null)
+return null;
+
+// //
+// Get documents to link
+
+String database = context.getDatabase();
+
+Collection docsToLink = null;
+
+try {
+context.setDatabase(wiki);
+
+XWikiApplication rootApp = appmanager.getRootApplication();
+
+if (rootApp != null)
+docsToLink = rootApp.getDocsNameToLink(true, context);
+else
+docsToLink =
+XWikiApplication.getDocsNameToLink(
+appmanager.getApplicationDocumentList(), true, 
context);
+} finally {
+context.setDatabase(database);
+}
+
+return docsToLink;
+}
+
 private void copyWiki(String sourceWiki, String targetWiki, String 
language,
 XWikiContext context) throws XWikiException
 {
-/*
- * TODO : add included copy support to xwiki-core and use this code
- * context.getWiki().copyWikiWeb(null, sourceWiki, 
getDocsNameToInclude(sourceWiki,
- * context), targetWiki, language, true, context);
- */
-
 XWiki xwiki = context.getWiki();
 
 // Copy all the wiki
 xwiki.copyWikiWeb(null, sourceWiki, targetWiki, language, true, 
context);
 
-// Replace documents contents to include
 String database = context.getDatabase();
 try {
 context.setDatabase(targetWiki);
 
+// Replace documents contents to include
 Collection docsNameToInclude = getDocsNameToInclude(sourceWiki, 
context);
 for (Iterator it = docsNameToInclude.iterator(); it.hasNext();) {
 String docFullName = (String) it.next();
@@ -212,6 +241,15 @@
 targetDoc.setContent("#includeInContext(\"" + sourceWiki + ":" 
+ docFullName
 + "\")");
 }
+
+// Replace documents contents to link
+Collection docsNameToLink = getDocsNameToLink(sourceWiki, context);
+for (Iterator it = docsNameToLink.iterator(); it.hasNext();) {
+String docFullName = (String) it.next();
+XWikiDocument targetDoc = xwiki.getDocument(docFullName, 
context);
+
+targetDoc.setContent("#includeTopic(\"" + sourceWiki + ":" + 
docFullName + "\")");
+}
 } finally {
 context.setDatabase(database);
 }

Modified: 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
2007-10-04 15:45:50 UTC (rev 5284)
+++ 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManagerPluginApi.java
2007-10-04 15:47:26 UTC (rev 5285)
@@ -315,6 +315,4 @@
 
 return listDocument;
 }
-
-
 }

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5287 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons

2007-10-04 Thread SVN
Author: dward
Date: 2007-10-04 17:50:16 +0200 (Thu, 04 Oct 2007)
New Revision: 5287

Added:
   
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/toc_collapsed.png
   
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/toc_expanded.png
Log:
- CURRIKI-1039
 - Added TOC collapsed/expanded images


Added: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/toc_collapsed.png
===
(Binary files differ)


Property changes on: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/toc_collapsed.png
___
Name: svn:mime-type
   + application/octet-stream

Added: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/toc_expanded.png
===
(Binary files differ)


Property changes on: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/icons/toc_expanded.png
___
Name: svn:mime-type
   + application/octet-stream

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5288 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-04 Thread SVN
Author: ludovic
Date: 2007-10-04 18:11:07 +0200 (Thu, 04 Oct 2007)
New Revision: 5288

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
Log:
CURRIKI-1037 TOC looses tree when Comments selected in View

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-04 15:50:16 UTC (rev 5287)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-04 16:11:07 UTC (rev 5288)
@@ -845,11 +845,11 @@
 $bentrydoc.getRenderedContent($content) #if($bentrydoc.fullName != 
$doc.fullName || !$displayFully)
 
 
-$msg.get("caption.readmore")#end
+$msg.get("caption.readmore")#end
 
 
 
-$msg.get("myBlog.postedBy", [$xwiki.getLocalUserName($bentrydoc.creator), 
$creationDay, $creationHour]) #sep() [$bentrydoc.comments.size() 
$msg.get("caption.comment")(s)>#if($bentrydoc.fullName != 
$doc.fullName)${bentrydoc.fullName}?bc=$!{request.bc}#end#comments]
+$msg.get("myBlog.postedBy", [$xwiki.getLocalUserName($bentrydoc.creator), 
$creationDay, $creationHour]) #sep() [$bentrydoc.comments.size() 
$msg.get("caption.comment")(s)>#if($bentrydoc.fullName != 
$doc.fullName)${bentrydoc.fullName}?bc=$!request.bc#end#comments]
 
 
 ## $msg.get("caption.sendToAFriend")
@@ -1066,9 +1066,9 @@
 
 
 #if($request.showMeta == true)
-$msg.get("asset.closeMoreInformation")
+$msg.get("asset.closeMoreInformation")
 #else
-$msg.get("asset.moreInformation")
+$msg.get("asset.moreInformation")
 #end
 
  ## asset-metadatas-block
@@ -1234,7 +1234,7 @@
 
 
 *$msg.get("colls.description")* $!collDoc.description
-$msg.get("caption.view") 
#if($collDoc.hasAccessLevel("edit"))
+$msg.get("caption.view") 
#if($collDoc.hasAccessLevel("edit"))
 #sep() $msg.get("caption.edit")
 #end
 #if("XWiki.${shortname}" == $context.user || $xwiki.hasAdminRights() || 
$xwiki.checkAccess($collDoc.fullName, "delete"))

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5289 - in xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources: WikiCode WikiManager XApp

2007-10-04 Thread SVN
Author: tmortagne
Date: 2007-10-04 19:07:27 +0200 (Thu, 04 Oct 2007)
New Revision: 5289

Added:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros
Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
Log:
XAWM-12: Add box that list all wikis current user is Admin.
XAWM-13: Add box that list all wikis current user can view.
XAWM-14: Add box that list all wikis current user own.
XAWM-15: Add box that list last created wikis ordered by creation date.
Some translation corrections

Added: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
 (rev 0)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
 2007-10-04 17:07:27 UTC (rev 5289)
@@ -0,0 +1,93 @@
+
+
+
+WikiCode
+LastCreatedWikisWidget
+
+en
+0
+
+XWiki.Admin
+XWiki.Admin
+
+XWiki.Admin
+1190974436000
+1191509752000
+1191509752000
+1.42
+
+
+
+
+
+
+
+XWiki.TagClass
+
+
+
+
+
+
+
+
+0
+input
+1
+tags
+1
+Tags
+1
+ 
+ ,|
+30
+0
+
+com.xpn.xwiki.objects.classes.StaticListClass
+
+
+WikiCode.LastCreatedWikisWidget
+0
+XWiki.TagClass
+
+
+
+
+#includeMacros("WikiCode.WidgetMacros")
+#includeMacros("WikiCode.Macros")
+
+#set($WikiManager = $xwiki.wikimanager)
+#set($Exception = $WikiManager.DefaultException)
+
+#
+
+#if(!$nb)
+  #set($nb = 5)
+#end
+
+#if(!$wikilist)
+  #set($wikilist = $WikiManager.getWikiDocumentList())
+#end
+
+#if(!$creationsortedwikilist)
+  #sortDocumentByCreationDate($wikilist $creationsortedwikilist false)
+#end
+
+#
+
+#widgetbegin($msg.get("wikimanager.widget.lastcreatedwikis.title"), "")
+#if(!$creationsortedwikilist.isEmpty())
+  
+#foreach($wikidoc in $creationsortedwikilist)
+  #if($velocityCount < $nb)
+
+  ;
+  
+  
+
+  #end
+#end
+  
http://$wikidoc.server[$wikidoc.creator]$wikidoc.creationDate
+#end +#widgetend() + \ No newline at end of file Added: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros === --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros (rev 0) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros 2007-10-04 17:07:27 UTC (rev 5289) @@ -0,0 +1,76 @@ + + + +WikiCode +Macros + +en +0 + +XWiki.Admin +XWiki.Admin + +XWiki.Admin +1191493346000 +1191506483000 +1191506483000 +1.38 + + + + + + + +XWiki.TagClass + + + + + + + + +0 +input +1 +tags +1 +Tags +1 + + ,| +30 +0 + +com.xpn.xwiki.objects.classes.StaticListClass + + +WikiCode.Macros +0 +XWiki.TagClass + + + + +#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist $asc) + #set($sorteddocumentlist = []) + + #if($documentlist.size() >0) +#set($doc0 = $documentlist.get(0)) + +#foreach($doc1 in $documentlist) + + #foreach($doc2 in $documentlist) +#if (!$sorteddocumentlist.contains($doc2)) + #if($sorteddocumentlist.contains($doc0) || ($asc && ($doc0.creationDate.compareTo($doc2.creationDate)) > 0) || (!$asc && ($doc0.creationDate.compareTo($doc2.creationDate) < 0))) +#set($doc0 = $doc2) + #end +#end + #end + + #set($added = $sorteddocumentlist.add($doc0)) +#end + #end +#end + Added: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget === --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget (rev 0) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2007-10-04 17:07:27 UTC (rev 5289) @@ -0,0 +

[xwiki-notifications] r5290 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels

2007-10-04 Thread SVN
Author: dward
Date: 2007-10-04 19:34:04 +0200 (Thu, 04 Oct 2007)
New Revision: 5290

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SearcherPanel.java
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorPanel.java
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorTogglePanel.java
Log:
- CURRIKI-1005
 - Change style applied to results scroll panel depending on if advanced 
filters open or not.

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-04 17:07:27 UTC (rev 5289)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-04 17:34:04 UTC (rev 5290)
@@ -315,6 +315,11 @@
 }
 }
 
+public ScrollPanel getScrollPanel()
+{
+return s;
+}
+
 public class hoverOnMouseover extends MouseListenerAdapter {
 public void onMouseEnter(Widget w){
 w.addStyleName("mouse-over");

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SearcherPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SearcherPanel.java
  2007-10-04 17:07:27 UTC (rev 5289)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SearcherPanel.java
  2007-10-04 17:34:04 UTC (rev 5290)
@@ -74,6 +74,7 @@
 results.addStyleName("search-results");
 results.setSelector(selector);
 add(results);
+selector.addResultsScrollPanel(results.getScrollPanel());
 
 pagination = new PaginationPanel();
 pagination.addStyleName("search-pagination");

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorPanel.java
  2007-10-04 17:07:27 UTC (rev 5289)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorPanel.java
  2007-10-04 17:34:04 UTC (rev 5290)
@@ -28,6 +28,7 @@
 import com.google.gwt.user.client.ui.SourcesClickEvents;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.ScrollPanel;
 import org.curriki.gwt.client.search.history.ClientState;
 import org.curriki.gwt.client.search.history.KeepsState;
 import org.curriki.gwt.client.search.selectors.Selectable;
@@ -173,4 +174,9 @@
 // If we have a cancel callback then we are in CB, so open selectors 
by default
 bottom.setToggleValue(true);
 }
+
+public void addResultsScrollPanel(ScrollPanel scrollPanel)
+{
+bottom.addResultsScrollPanel(scrollPanel);
+}
 }

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorTogglePanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorTogglePanel.java
2007-10-04 17:07:27 UTC (rev 5289)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorTogglePanel.java
2007-10-04 17:34:04 UTC (rev 5290)
@@ -26,6 +26,7 @@
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.ScrollPanel;
 import org.curriki.gwt.client.Main;
 import org.curriki.gwt.client.Constants;
 import org.curriki.gwt.client.search.history.KeepsState;
@@ -34,6 +35,7 @@
 public class SelectorTogglePanel extends VerticalPanel implements 
ClickListener, KeepsState
 {
 protected SelectorFilterPanel filters;
+protected ScrollPanel scroller;
 protected HTML toggleWidget;
 
 public SelectorTogglePanel()
@@ -73,8 +75,16 @@
 
 if (filters.isVisible()){
 
toggleWidget.setHTML(Main.getTranslation("search.instruction.adv.close"));
+if (scroller != null){
+scroller.removeStyleName("find-results-scroller-simple");
+scroller.addStyleName("find-results-scroller-advanced");
+}
 } else {
 
toggleWidget.setHTML(Main.getTranslation("search.instruction.adv.open"));
+if (scroller != null){
+scroller.rem

[xwiki-notifications] r5291 - in xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search: . panels

2007-10-04 Thread SVN
Author: dward
Date: 2007-10-04 20:53:38 +0200 (Thu, 04 Oct 2007)
New Revision: 5291

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/Results.java
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsRenderer.java
Log:
- CURRIKI-1042
 - Display a message when all remaining results are not viewable by the user 
(such as marked "Private")

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/Results.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/Results.java
   2007-10-04 17:34:04 UTC (rev 5290)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/Results.java
   2007-10-04 18:53:38 UTC (rev 5291)
@@ -41,16 +41,23 @@
 
 public void setResults(int hitcount, List documentList)
 {
+int shownResults = 0;
+
 renderer.clear();
 
 Iterator i = documentList.iterator();
 while (i.hasNext()){
 Document doc = (Document) i.next();
 renderer.addRow(doc);
+shownResults++;
 }
 
 paginator.adjust(paginator.getFetchCount(), paginator.getStart(), 
hitcount);
 
+if (shownResults == 0 && hitcount > 0){
+renderer.addRowNoShowableResults();
+}
+
 if (hitcount == 0){
 renderer.addRowNoResults();
 }

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-04 17:34:04 UTC (rev 5290)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
   2007-10-04 18:53:38 UTC (rev 5291)
@@ -208,6 +208,16 @@
 curRow++;
 }
 
+public void addRowNoShowableResults()
+{
+g.getRowFormatter().addStyleName(curRow, "find-results-table-result");
+g.getFlexCellFormatter().setColSpan(curRow, 0, 4);
+HTML msg = new HTML(Main.getTranslation("search.noshowableresults"));
+msg.addStyleName("search-noresults");
+g.setWidget(curRow, 0, msg);
+curRow++;
+}
+
 public void setSelector(Selectable selector){
 this.selector = selector;
 }

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsRenderer.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsRenderer.java
2007-10-04 17:34:04 UTC (rev 5290)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsRenderer.java
2007-10-04 18:53:38 UTC (rev 5291)
@@ -30,4 +30,5 @@
 public void addHeadings();
 public void addRow(Document doc);
 public void addRowNoResults();
+public void addRowNoShowableResults();
 }

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5292 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-04 Thread SVN
Author: dward
Date: 2007-10-04 21:52:01 +0200 (Thu, 04 Oct 2007)
New Revision: 5292

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/arrow-red.png
Log:
- CURRIKI-1039
 - Changed arrow to be the same as the version in the icons/ sub-directory


Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/arrow-red.png
===
(Binary files differ)

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5293 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-04 Thread SVN
Author: dward
Date: 2007-10-04 22:16:36 +0200 (Thu, 04 Oct 2007)
New Revision: 5293

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
Log:
- Appended new styles from Guillaume (he couldn't supply bug numbers affected)


Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css   
2007-10-04 19:52:01 UTC (rev 5292)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css   
2007-10-04 20:16:36 UTC (rev 5293)
@@ -3456,3 +3456,820 @@
 .collapsed ul {
   display: none;
 }
+
+/*CRS for the view tab in the main site*/
+.crs_reviewtitle, .crs_reviewpending, .crs_reviewreview {
+  padding-left: 6px;
+}
+.crs_review {
+  font-family:Arial,sans-serif;
+  font-size:13px;  
+}
+.crs_reviewtitle {
+  color: #2264A1;
+}
+.crs_reviewimage {
+  float: left;
+  width: 48px;
+  height: 46px;
+}
+.crs_reviewratingtext {
+  padding: 7px 0 0 6px;
+  font-size: 14px;
+}
+.crs_reviewratingdate {
+  color: #919179;
+  padding-bottom: 7px;
+}
+.crs_reviewpending, .crs_reviewreview, .metadata-edit-panel  
.crs_reviewnominate {
+  cursor: pointer;
+  float: left;
+}
+.crs_reviewpending, .metadata-edit-panel  .crs_reviewnominate {
+  font-style: italic;
+  color: #919179;
+  padding-right: 9px;
+}
+.crs_reviewpending {
+  clear: both;
+}
+.crs_reviewreview {
+  border-left: 1px solid #919179; 
+}
+.crs_reviewpending a {
+  font-style: normal;
+}
+.crs_reviewreview {
+  padding-left: 9px;
+}
+
+
+/*CRS for the comments tab in the main site */
+.crs_reviews {
+  background: #FFF;
+  border: 1px solid #D2D2D2;  
+  padding: 10px;
+}
+.crs_reviewstitle {
+  color: #2264A1;
+  border-bottom: 1px solid #2264A1; 
+}
+.crs_reviewstitle .gwt-HTML {
+  margin: 0;
+}
+.crs_reviewsreview {
+  padding:15px 0;
+  border-bottom: 1px dotted #D2D2D2;
+}
+.crs_reviewsdate, .crs_reviewsdate .gwt-HTML {
+  color: #919179;
+  padding: 0 0 10px;
+  font-size: 11px;
+}
+.crs_reviewsreview table {
+  font-family:Arial,sans-serif;
+  font-size:13px;  
+}
+.crs_reviewscomment table {
+  width: 570px !important;
+}
+.crs_reviewscomment table li {
+  margin-left: 10px !important;
+}
+table.comment-page td td {
+  padding: 0;  
+}
+table.comment-page td {
+  padding: 0 10px;  
+}
+.layoutsubsection .xwikiintracontent .collapsed {
+  display: none;
+}
+.layoutsubsection #commentform {
+  border: 1px solid #D2D2D2;
+  margin: 0;
+}
+.layoutsubsection #commentscontent {
+  margin: 10px 0;
+  padding: 0;
+  border: 0;
+}
+#commentscontent #commentform button {
+  margin-top: 5px;
+}
+#commentscontent #commentform button.button_grey {
+  border-width: 1px;
+  margin-left: 5px;
+}
+.asset-page #commentscontent {
+  margin: 0 0 -5px;
+}
+.crs_reviewrating img.crs_reviewratingtext {
+  cursor: pointer;
+}
+
+/*CRS for the Information tab in the builder */
+.metadata-edit-panel .crs_reviewtitle {
+  display: inline;
+  color: #000;
+  font-weight: bold;
+  padding-left: 0;
+}
+.metadata-edit-panel .crs_reviewrating {
+  position: relative;
+}
+.metadata-edit-panel .crs_reviewrating div {
+  margin-left: 50px;
+}
+.metadata-edit-panel .crs_reviewrating img {
+  position: absolute;
+  top: -5;
+}
+.metadata-edit-panel .crs_reviewnominate a, .metadata-edit-panel 
.crs_reviewreview a {
+  text-decoration: none;
+  font-style: normal;  
+}
+.metadata-edit-panel span.gwt-CheckBox {
+  display: block;
+  margin-top: 20px;
+}
+
+/*CRS for the comments tab in the builder */
+table.comment-page td table td {
+  padding: 15px 10px;
+  background-color: #fff;
+  border: 1px solid #DCDBD9;
+}
+table.comment-page td table td td {
+  padding: 0;
+  border-width: 0;
+}
+.comment-page .asset-page {
+  background-color: #fff;
+  padding: 0;
+}
+.comment-page .asset-page .xwikiintracontent {
+  border-width: 0;
+}
+.comment-page .crs_reviewscontent table {
+  width: 90%;
+}
+.comment-page .crs_reviewsdate .gwt-HTML {
+  padding: 0;
+  position: relative,
+}
+.comment-page .crs_reviewscontenttext {
+  float: left;
+  display: block;
+  padding-top: 18px;
+}
+.crs_reviewnorating .crs_reviewratingtext {
+  padding: 7px 0 0 0;
+}
+.comment-page .xwikicomment {
+  padding: 15px 0;
+}
+
+/*Direction builder for the editor CBOE*/
+div.item-direction-panel2 {
+  padding: 0;
+}
+.item-direction-panel2 .gwt-HTML, .item-direction-panel2 .item-header-buttons 
.gwt-Button {
+  color: #65659B;
+}
+.item-direction-panel2 .item-header-buttons .gwt-Button {
+  border-color: #65659B;
+  padding: 0 4px;
+  border-width: 0;
+}
+.item-direction-panel2 .item-header-buttons .edit-btt-edit,  
.item-direction-panel2 .item-header-buttons .edit-btt-dupl, 
.item-direction-panel2 .item-header-buttons .edit-btt-remove, 
.item-direction-panel2 .item-header-buttons .edit-btt-cancel {
+  border-right-width: 1px;
+}
+div.item-direction-panel2 {
+  border: 1px dashed #65659B;
+}
+div.item-dir

[xwiki-notifications] r5295 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-04 Thread SVN
Author: ludovic
Date: 2007-10-04 23:52:36 +0200 (Thu, 04 Oct 2007)
New Revision: 5295

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
Log:
CURRIKI-996 the CRS review date is displaying the wrong format

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-04 20:45:32 UTC (rev 5294)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-04 21:52:36 UTC (rev 5295)
@@ -821,7 +821,7 @@
 ##
 ##
 #macro(displayBlogArticle $bentrydoc $bentryobj $displayFully)
-#set($creationDay = $xwiki.formatDate($bentrydoc.creationDate,"MM-dd-yy"))
+#set($creationDay = 
$xwiki.formatDate($bentrydoc.creationDate,$msg.get("dateFormat")))
 #set($creationHour = $xwiki.formatDate($bentrydoc.creationDate,"hh:mm a"))
 #set($title = $!bentrydoc.display("title","view", $bentryobj))
 #if($title == "")
@@ -1015,7 +1015,7 @@
  ##tableau pr l'image
 
  *$msg.get("asset.lastupdated"):* 
-$!xwiki.formatDate($asset.date, "MM/dd/yy")
+$!xwiki.formatDate($asset.date, $msg.get("dateFormat"))
 
 
 #set($status = $!asset.status)
@@ -1242,7 +1242,7 @@
 #sep() $msg.get("caption.delete")
 #end
 
-*$msg.get("colls.last_edited")* $!xwiki.formatDate($collDoc.date, 
"MM/dd/yy")
+*$msg.get("colls.last_edited")* $!xwiki.formatDate($collDoc.date, 
$msg.get("dateFormat"))
 #if($!collDoc.fw_items.trim() == "")
  #set($subjects = "All")
 #else
@@ -1343,7 +1343,7 @@
 
 #if($lastreview_date)
 
-$msg.get("curriki.crs.asof") $xwiki.formatDate($lastreview_date, "MM/dd/yy")
+$msg.get("curriki.crs.asof") $xwiki.formatDate($lastreview_date, 
$msg.get("dateFormat"))
 
 #end
 
@@ -1411,7 +1411,7 @@
 #set($date = $asset.getValue("date"))
 #set($user = $asset.display("user"))
 
-$xwiki.formatDate($date, "MM/dd/yy")
+$xwiki.formatDate($date, $msg.get("dateFormat"))
 
 
 #if($rating&&($rating!="0"))

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5296 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-04 Thread SVN
Author: ludovic
Date: 2007-10-05 00:05:51 +0200 (Fri, 05 Oct 2007)
New Revision: 5296

Modified:
   
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/commentsinline.vm
Log:
CURRIKI-996 the CRS review date is displaying the wrong format

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/commentsinline.vm
===
--- 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/commentsinline.vm
   2007-10-04 21:52:36 UTC (rev 5295)
+++ 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/commentsinline.vm
   2007-10-04 22:05:51 UTC (rev 5296)
@@ -64,7 +64,7 @@
 
 #set($date = $!comment.getProperty("date").value)
   $!xwiki.getUserName($doc.display('author','view',$comment))
-#if($date!="") $xwiki.formatDate($date,"MM/dd/yy")#end
+#if($date!="") $xwiki.formatDate($date,$msg.get("dateFormat"))#end
 #set($delredir = $doc.getURL("view", "viewer=comments"))
 ## #if($hasedit) $msg.get("removethiscomment")#end
 ## endif hasedit

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5297 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-04 Thread SVN
Author: ludovic
Date: 2007-10-05 00:39:01 +0200 (Fri, 05 Oct 2007)
New Revision: 5297

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
Log:
CURRIKI-1027 TOC default title not matching TOC in Edit

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-04 22:05:51 UTC (rev 5296)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-04 22:39:01 UTC (rev 5297)
@@ -124,7 +124,7 @@
  #if($currikiDoc.space.startsWith("Coll_"))
   #findUserPrefix($currikiDoc.space.substring(5))
   #if($currikiDoc.name == "Default")
-   #set($currikiTitle = "${userPrefix} Collection")
+   #set($currikiTitle = "${userPrefix} Default Collection")
   #elseif($currikiDoc.name == "WebHome")
#set($currikiTitle = "${userPrefix} Collections")
   #end

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5298 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem

2007-10-04 Thread SVN
Author: ludovic
Date: 2007-10-05 01:13:31 +0200 (Fri, 05 Oct 2007)
New Revision: 5298

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemHeader.java
Log:
CURRIKI-941 CBOE Styling

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemHeader.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemHeader.java
2007-10-04 22:39:01 UTC (rev 5297)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/widgets/currikiitem/CurrikiItemHeader.java
2007-10-04 23:13:31 UTC (rev 5298)
@@ -262,10 +262,15 @@
 }
 
 public void setTitle(String title){
-if (isDirectionBlock())
+String imgSuffix = ".png";
+if (isDirectionBlock()) {
+imgSuffix = "_white.gif";
 this.title.setText(Main.getTranslation("editor.cbdirections"));
-else
+} else {
 this.title.setText(title);
+}
+hideBt.setUrl(Constants.ICON_PATH+"collapse_down" + imgSuffix);
+showBt.setUrl(Constants.ICON_PATH+"collapse" + imgSuffix);
 }
 
 public void onClick(Widget widget) {

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5299 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors

2007-10-04 Thread SVN
Author: dward
Date: 2007-10-05 02:44:29 +0200 (Fri, 05 Oct 2007)
New Revision: 5299

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors/InstructionalTypeSelector.java
Log:
- CURRIKI-1045
 - curriculum_unit added to select list and translation strings


Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors/InstructionalTypeSelector.java
===
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors/InstructionalTypeSelector.java
   2007-10-04 23:13:31 UTC (rev 5298)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/selectors/InstructionalTypeSelector.java
   2007-10-05 00:44:29 UTC (rev 5299)
@@ -51,6 +51,7 @@
 addGroup(Main.getTranslation("search.selector.ict.curriculum"));
 addGroupOption(Main.getTranslation("search.selector.ict.curriculum"), 
Main.getTranslation("search.selector.ict.curriculum.assessment"), 
"curriculum_assessment");
 addGroupOption(Main.getTranslation("search.selector.ict.curriculum"), 
Main.getTranslation("search.selector.ict.curriculum.course"), 
"curriculum_course");
+addGroupOption(Main.getTranslation("search.selector.ict.curriculum"), 
Main.getTranslation("search.selector.ict.curriculum.unit"), "curriculum_unit");
 addGroupOption(Main.getTranslation("search.selector.ict.curriculum"), 
Main.getTranslation("search.selector.ict.curriculum.lp"), "curriculum_lp");
 addGroupOption(Main.getTranslation("search.selector.ict.curriculum"), 
Main.getTranslation("search.selector.ict.curriculum.scope"), 
"curriculum_scope");
 addGroupOption(Main.getTranslation("search.selector.ict.curriculum"), 
Main.getTranslation("search.selector.ict.curriculum.standards"), 
"curriculum_standards");

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5302 - xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api

2007-10-05 Thread SVN
Author: tmortagne
Date: 2007-10-05 17:19:12 +0200 (Fri, 05 Oct 2007)
New Revision: 5302

Modified:
   
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
Log:
XWIKI-1779: Add getWikiName and getPrefixedFullName in 
com.xpn.xwiki.api.Document

Modified: 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
===
--- 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
   2007-10-05 15:18:55 UTC (rev 5301)
+++ 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
   2007-10-05 15:19:12 UTC (rev 5302)
@@ -66,7 +66,7 @@
 
 /**
  * this function is accessible only if you have the programming rights 
give access to the
- * priviledged API of the Document
+ * privileged API of the Document
  */
 public XWikiDocument getDocument()
 {
@@ -112,7 +112,7 @@
 /**
  * return the name of the space of the document
  *
- * for exemple if the fullName of a document is "MySpace.Mydoc", the name 
is MySpace
+ * for example if the fullName of a document is "MySpace.Mydoc", the name 
is MySpace
  *
  * @return the name of the space of the document
  */
@@ -120,6 +120,14 @@
 {
 return doc.getSpace();
 }
+
+/**
+ * @return the name of the wiki where this document is stored.
+ */
+public String getWikiName()
+{
+return doc.getDatabase();
+}
 
 /**
  * return the name of the space of the document
@@ -134,7 +142,7 @@
 }
 
 /**
- * return the fullName of a doucment
+ * return the fullName of a document
  *
  * if a document has for name "MyDoc" and space "MySpace", the fullname is 
"MySpace.MyDoc" In a
  * wiki, all the documents have a different fullName.
@@ -143,6 +151,15 @@
 {
 return doc.getFullName();
 }
+
+/**
+ * @return the real full name of a document containing wiki name where 
document is stored.
+ * For document in "xwiki" wiki, with name "MyDoc" and space "MySpace" the 
extended full name is "xwiki:MySpace.MyDoc".
+ */
+public String getPrefixedFullName()
+{
+return (getWikiName() != null ? getWikiName() + ":" : "") + 
getFullName();
+}
 
 public Version getRCSVersion()
 {

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5300 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api

2007-10-05 Thread SVN
Author: tmortagne
Date: 2007-10-05 17:12:57 +0200 (Fri, 05 Oct 2007)
New Revision: 5300

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
Log:
XWIKI-1779: Add getWikiName and getPrefixedFullName in 
com.xpn.xwiki.api.Document

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
===
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
  2007-10-05 00:44:29 UTC (rev 5299)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
  2007-10-05 15:12:57 UTC (rev 5300)
@@ -112,7 +112,7 @@
 /**
  * return the name of the space of the document
  *
- * for exemple if the fullName of a document is "MySpace.Mydoc", the name 
is MySpace
+ * for example if the fullName of a document is "MySpace.Mydoc", the name 
is MySpace
  *
  * @return the name of the space of the document
  */
@@ -122,6 +122,14 @@
 }
 
 /**
+ * @return the name of the wiki where this document is stored.
+ */
+public String getWikiName()
+{
+return doc.getDatabase();
+}
+
+/**
  * return the name of the space of the document
  *
  * for exemple if the fullName of a document is "MySpace.Mydoc", the name 
is MySpace
@@ -134,7 +142,7 @@
 }
 
 /**
- * return the fullName of a doucment
+ * return the fullName of a document
  *
  * if a document has for name "MyDoc" and space "MySpace", the fullname is 
"MySpace.MyDoc" In a
  * wiki, all the documents have a different fullName.
@@ -144,6 +152,15 @@
 return doc.getFullName();
 }
 
+/**
+ * @return the real full name of a document containing wiki name where 
document is stored.
+ * For document in "xwiki" wiki, with name "MyDoc" and space "MySpace" the 
extended full name is "xwiki:MySpace.MyDoc".
+ */
+public String getPrefixedFullName()
+{
+return getWikiName() + ":" + getFullName();
+}
+
 public Version getRCSVersion()
 {
 return doc.getRCSVersion();

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5301 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api

2007-10-05 Thread SVN
Author: tmortagne
Date: 2007-10-05 17:18:55 +0200 (Fri, 05 Oct 2007)
New Revision: 5301

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
Log:
XWIKI-1779: take care of when document's wiki name is null

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
===
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
  2007-10-05 15:12:57 UTC (rev 5300)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
  2007-10-05 15:18:55 UTC (rev 5301)
@@ -158,7 +158,7 @@
  */
 public String getPrefixedFullName()
 {
-return getWikiName() + ":" + getFullName();
+return (getWikiName() != null ? getWikiName() + ":" : "") + 
getFullName();
 }
 
 public Version getRCSVersion()

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5303 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode

2007-10-05 Thread SVN
Author: tmortagne
Date: 2007-10-05 17:31:12 +0200 (Fri, 05 Oct 2007)
New Revision: 5303

Removed:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros
Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
Log:
Merge "WikiCode.Macros" and "WikiCode.WidgetMaros"

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
 2007-10-05 15:19:12 UTC (rev 5302)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
 2007-10-05 15:31:12 UTC (rev 5303)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1190974436000
-1191509752000
-1191509752000
-1.42
+1191596262000
+1191596262000
+1.43
 
 
 
@@ -53,8 +53,7 @@
 
 
 
-#includeMacros("WikiCode.WidgetMacros")
-#includeMacros("WikiCode.Macros")
+#includeMacros("WikiCode.Macros")
 
 #set($WikiManager = $xwiki.wikimanager)
 #set($Exception = $WikiManager.DefaultException)

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
 2007-10-05 15:19:12 UTC (rev 5302)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
 2007-10-05 15:31:12 UTC (rev 5303)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1191493346000
-1191506483000
-1191506483000
-1.38
+1191596123000
+1191596123000
+1.51
 
 
 
@@ -53,7 +53,19 @@
 
 
 
-#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist 
$asc)
+#macro(widgetbegin $title $rss)
+

$title + #if($rss && $rss != "") + + #end +

+#end + +#macro(widgetend ) + +#end + +#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist $asc) #set($sorteddocumentlist = []) #if($documentlist.size() >0) @@ -72,5 +84,37 @@ #set($added = $sorteddocumentlist.add($doc0)) #end #end +#end + +#macro(addlastwikimodifications $documentlist $wikiname $usermodifications $usermodificationswiki $nb) + #set($currentwiki = $context.database) + #if($wikiname) +$context.setDatabase($wikiname) + #else +#set($wikiname = $context.Database) + #end + + #set($sql = "where 1=1") + #if($usermodifications) +#if($context.database != $usermodificationswiki) + #set($sql = "${sql} and doc.author='${usermodificationswiki}:${usermodifications}'") +#else + #set($sql = "${sql} and doc.author='${usermodifications}'") +#end + #end + #set($sql = "${sql} order by doc.date desc") + + #set ($list = $xwiki.searchDocuments($sql , $nb , 0)) + + #foreach($docname in $list) +#if ($xwiki.hasAccessLevel("view", $context.user, "${context.database}:${docname}")) + #set($item = $xwiki.getDocument($docname)) + #set($added = $documentlist.add($item)) +#end + #end + + #if($context.database != $currentwiki) +$context.setDatabase($currentwiki) + #end #end Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget === --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2007-10-05 15:19:12 UTC (rev 5302) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2007-10-05 15:31:12 UTC (rev 5303) @@ -12,9 +12,9 @@ XWiki.Admin 1190979406000 -1191517249000 -1191517249000 -1.51 +1191596429000 +1191596429000 +1.52 @@ -53,7 +53,7 @@ -#includeMacros("WikiCode.WidgetMacros") +#includeMacros("WikiCode.Macros") #set($WikiManager = $xwiki.wikimanager) #set($Exception = $WikiManager.DefaultException) Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget === --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2007-10-05 15:19:12 UTC (rev 5302) +++ xwiki-platform/xwiki-applications/trunk/wiki

[xwiki-notifications] r5304 - in xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources: WikiCode WikiResources

2007-10-05 Thread SVN
Author: tmortagne
Date: 2007-10-05 18:06:32 +0200 (Fri, 05 Oct 2007)
New Revision: 5304

Added:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
Log:
XAWM-16: Add a code snippet that list last documents modifications and support :
  - can choose from which list of wikis to get documents
  - can choose which user modified documents
  - can choose number of documents to print
  - can choose date format

Added: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
  (rev 0)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
  2007-10-05 16:06:32 UTC (rev 5304)
@@ -0,0 +1,97 @@
+
+
+
+WikiCode
+LastWikiModificationsCode
+
+en
+0
+
+XWiki.Admin
+XWiki.Admin
+
+XWiki.Admin
+1191506975000
+1191600053000
+1191600053000
+1.41
+
+
+
+
+
+
+
+XWiki.TagClass
+
+
+
+
+
+
+
+
+0
+input
+1
+tags
+1
+Tags
+1
+ 
+ ,|
+30
+0
+
+com.xpn.xwiki.objects.classes.StaticListClass
+
+
+WikiCode.LastWikiModificationsCode
+0
+XWiki.TagClass
+
+
+
+
+#includeMacros("WikiCode.Macros")
+
+#
+
+#if(!$nb)
+  #set($nb = 30)
+#end
+
+#if(!$formatDate)
+  #set($formatDate = $msg.get("wikimanager.defaultdatetimeformat"))
+#end
+
+#if(!$wikinamelist)
+  #if(!$wikiname)
+#set($wikinamelist = [$context.Database])
+  #else
+#set($wikinamelist = [$wikiname])
+  #end
+#end
+
+#set($documentlist = [])
+#foreach($wikiname in $wikinamelist)
+  #addlastwikimodifications($documentlist $wikiname $usermodifications 
$usermodificationswiki $nb)
+#end
+
+#
+
+
    + #foreach ($item in $documentlist) +
  • + [$item.name in $item.web>$item.prefixedFullName] + $xwiki.formatDate($item.date, $formatDate) + #set($author = $xwiki.getUserName($item.author)) + #if ($author == "XWikiGuest") + Guest +#else + $author +#end +
  • + #end +
+ \ No newline at end of file Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations === --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations 2007-10-05 15:31:12 UTC (rev 5303) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations 2007-10-05 16:06:32 UTC (rev 5304) @@ -12,9 +12,9 @@ XWiki.Admin 1186671807000 -1191491461000 -1191491461000 -1.17 +1191600072000 +1191600072000 +1.21 @@ -58,6 +58,10 @@ wikimanager.wikinameneeded=A name for the wiki is necessary +# CONF + +wikimanager.defaultdatetimeformat= dd 'at' HH:mm + # LABELS wikimanager.createwiki=Create a new wiki @@ -83,6 +87,8 @@ wikimanager.widget.userwikisadmin.title=Wikis you administrate wikimanager.widget.userwikisuser.title=Wikis you view wikimanager.widget.userwikisowner.title=Wikis you own +wikimanager.widget.lastmodifications.title=Recent pages modifications +wikimanager.widget.mylastmodifications.title=My recent pages modifications # ANSWERS ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5305 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode

2007-10-05 Thread SVN
Author: tmortagne
Date: 2007-10-05 18:15:31 +0200 (Fri, 05 Oct 2007)
New Revision: 5305

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
Log:
XAWM-16: Fix document list limit in mixed wikis mode

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
  2007-10-05 16:06:32 UTC (rev 5304)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
  2007-10-05 16:15:31 UTC (rev 5305)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1191506975000
-1191600053000
-1191600053000
-1.41
+1191600769000
+1191600769000
+1.42
 
 
 
@@ -78,6 +78,10 @@
   #addlastwikimodifications($documentlist $wikiname $usermodifications 
$usermodificationswiki $nb)
 #end
 
+#if($documentlist.size() > $nb)
+  #set($documentlist = $documentlist.subList(0, $nb-1))
+#end
+
 #
 
 
    ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5306 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

2007-10-05 Thread SVN
Author: dward
Date: 2007-10-05 21:17:37 +0200 (Fri, 05 Oct 2007)
New Revision: 5306

Modified:
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
Log:
- CURRIKI-1050
 - Remove hard-coded host name to get icons


Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css
===
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css   
2007-10-05 16:15:31 UTC (rev 5305)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css   
2007-10-05 19:17:37 UTC (rev 5306)
@@ -3754,7 +3754,7 @@
   position: relative;
 }
 .curriki_toc li.selected img, .curriki_toc li.expanded img, .curriki_toc 
li.selected li.selected img, .curriki_toc li.collapsed img {
-  background: #CE url(http://next.dev.curriki.org/xwiki/gwt/tree_open.gif) 
no-repeat;
+  background: #CE url(/xwiki/gwt/tree_open.gif) no-repeat;
   cursor: pointer;
   position: absolute;
   top: 2px;
@@ -3762,7 +3762,7 @@
   left: -17px;
 }
 .curriki_toc li.collapsed img {
-  background: #CE 
url(http://next.dev.curriki.org/xwiki/gwt/tree_closed.gif) no-repeat;
+  background: #CE url(/xwiki/gwt/tree_closed.gif) no-repeat;
 }
 .curriki_toc li.expanded, .curriki_toc li.collapsed {
   

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5307 - in xwiki-products/curriki/trunk/wiki/src/main/resources: . Admin CRS Panels XWiki

2007-10-05 Thread SVN
Author: dward
Date: 2007-10-05 21:49:25 +0200 (Fri, 05 Oct 2007)
New Revision: 5307

Added:
   xwiki-products/curriki/trunk/wiki/src/main/resources/XWiki/MemberCount.en
Modified:
   xwiki-products/curriki/trunk/wiki/src/main/resources/Admin/PageList
   xwiki-products/curriki/trunk/wiki/src/main/resources/CRS/ReviewEmail
   xwiki-products/curriki/trunk/wiki/src/main/resources/Panels/Navigation
   xwiki-products/curriki/trunk/wiki/src/main/resources/Panels/TOC
   
xwiki-products/curriki/trunk/wiki/src/main/resources/XWiki/CurrikiGWTTranslation
   xwiki-products/curriki/trunk/wiki/src/main/resources/XWiki/ToTranslate
   xwiki-products/curriki/trunk/wiki/src/main/resources/package.xml
Log:
- Export final versions of wiki pages before 1.3.0 release to SVN


Modified: xwiki-products/curriki/trunk/wiki/src/main/resources/Admin/PageList
===
--- xwiki-products/curriki/trunk/wiki/src/main/resources/Admin/PageList 
2007-10-05 19:17:37 UTC (rev 5306)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/Admin/PageList 
2007-10-05 19:49:25 UTC (rev 5307)
@@ -12,14 +12,14 @@
 
 XWiki.dward
 1168117384000
-1191530436000
-1191530436000
-1.60
+1191533684000
+1191533684000
+1.61
 
 
 
 
-Added CRS items, removed Coll_templates item
+Added Panels.Navigation and Panels.TOC
 
 
 XWiki.TagClass
@@ -324,6 +324,7 @@
 Panels.MyGroups
 Panels.My Groups
 Panels.MyInformationArea
+Panels.Navigation
 Panels.NewPage
 Panels.New Panel
 Panels.ObjectEditorWelcome
@@ -342,6 +343,7 @@
 Panels.Shortcuts
 Panels.Spaces
 Panels.SyntaxHelp
+Panels.TOC
 Panels.ToDo
 Panels.Toolbox
 Panels.WebHome

Modified: xwiki-products/curriki/trunk/wiki/src/main/resources/CRS/ReviewEmail
===
--- xwiki-products/curriki/trunk/wiki/src/main/resources/CRS/ReviewEmail
2007-10-05 19:17:37 UTC (rev 5306)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/CRS/ReviewEmail
2007-10-05 19:49:25 UTC (rev 5307)
@@ -12,14 +12,14 @@
 
 XWiki.LudovicDubost
 119115691
-1191156982000
-1191156982000
-1.1
+119153764
+119153764
+1.2
 
 
 
 
-Added review email
+Fix review email
 
 
 XWiki.TagClass
@@ -54,7 +54,7 @@
 
 
 #set($nl = $xwiki.getNl())
-From: $adminemail${nl}To: $email${nl}Subject: Your asset has been reviewed
+From: $adminemail${nl}To: $email${nl}Subject: Your resource has been reviewed 
by Curriki.
 
 Greetings from the Curriki Review team. Your contribution, $assettitle, has 
recently been reviewed and was given a rating of $assetrating. You can read the 
full comments from this review by clicking on the following link:
 

Modified: xwiki-products/curriki/trunk/wiki/src/main/resources/Panels/Navigation
===
--- xwiki-products/curriki/trunk/wiki/src/main/resources/Panels/Navigation  
2007-10-05 19:17:37 UTC (rev 5306)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/Panels/Navigation  
2007-10-05 19:49:25 UTC (rev 5307)
@@ -8,18 +8,18 @@
 0
 
 XWiki.martagirdea
-XWiki.dward
+XWiki.ToddSherman
 
-XWiki.dward
+XWiki.ToddSherman
 1171480785000
-1187286703000
-1187286703000
-1.117
+1191445377000
+1191445377000
+1.145
 
 
 
 
-Changed link to My Collections to go to the template
+Changed BrowseSearch to just Browse to go to new Browse 
page.
 
 
 Panels.PanelClass
@@ -104,27 +104,36 @@
 <script type="text/javascript" src="/xwiki/yui/treeview/treeview-min.js" 
></script>
 <script type="text/javascript" 
src="/xwiki/yui/treeview/checknode.js"></script>
 <script language="javascript" src="/xwiki/gwt2.js"></script>
-<iframe id="__gwt_historyFrame" 
style="width:0;height:0;border:0"></iframe>
+<script language="JavaScript">
+ function tourpop()
+ {
+   tourwindow = window.open 
("http://www.curriki.org/xwiki/xwiki/download/Coll_curriki/GuidedTourofCurriki/currikitour.zip/currikitour/index.html";,
+"tourwindow","menubar=0,resizable=0,width=740,height=540");}
+</SCRIPT>
+<iframe src="javascript:''" id="__gwt_historyFrame" 
style="width:0;height:0;border:0"></iframe>
+<script type="text/javascript">
+ if (window.GWTArguments && window.GWTArguments.load_on_startup) 
{loadGWT();}
+</script>
 <div id="treeviewtemp" style="display: none;"></div>
 #beginNavigationPanel()
 ##
 ##
 ##
-#navigationCategory("Browse Resources", "", true, 
+#navigationCategory($msg.get('panel.navigation.browseresource'), "", true, 
   [
-   ["Featured Resources", "Main.FeaturedContent"], 
-   ["By Subject", "Main.BrowseSearch"]
+   [$msg.get('panel.navigation.featureresources&#x

[xwiki-notifications] r5308 - xwiki-products/curriki/tags

2007-10-05 Thread SVN
Author: dward
Date: 2007-10-05 22:58:02 +0200 (Fri, 05 Oct 2007)
New Revision: 5308

Added:
   xwiki-products/curriki/tags/curriki-1.3.0/
Log:
- Tagging the 1.3.0 release (Oct 5, 2007)


Copied: xwiki-products/curriki/tags/curriki-1.3.0 (from rev 5307, 
xwiki-products/curriki/trunk)

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5309 - xwiki-products/curriki/branches

2007-10-05 Thread SVN
Author: dward
Date: 2007-10-05 23:03:11 +0200 (Fri, 05 Oct 2007)
New Revision: 5309

Added:
   xwiki-products/curriki/branches/curriki-1.3/
Log:
Branching the 1.3 release

Copied: xwiki-products/curriki/branches/curriki-1.3 (from rev 5307, 
xwiki-products/curriki/trunk)

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5310 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store

2007-10-06 Thread SVN
Author: sdumitriu
Date: 2007-10-06 10:43:56 +0200 (Sat, 06 Oct 2007)
New Revision: 5310

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
Log:
Replaced 2-line log with a 1-line one.



Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
===
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
 2007-10-05 21:03:11 UTC (rev 5309)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
 2007-10-06 08:43:56 UTC (rev 5310)
@@ -360,8 +360,7 @@
 }
 catch (Exception e) {
 if ( log.isErrorEnabled() ) {
-log.error("While executing query: " + sql);
-log.error("Failed updating schema: " + e.getMessage());
+log.error("Failed updating schema while executing query \"" + 
sql + "\":" + e.getMessage());
 }
 }
 finally {

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5311 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store

2007-10-06 Thread SVN
Author: sdumitriu
Date: 2007-10-06 10:46:24 +0200 (Sat, 06 Oct 2007)
New Revision: 5311

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
Log:
Improve logging


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
===
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
 2007-10-06 08:43:56 UTC (rev 5310)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
 2007-10-06 08:46:24 UTC (rev 5311)
@@ -311,7 +311,7 @@
 schemaSQL = config.generateSchemaUpdateScript(dialect, meta);
 }
 catch (Exception e) {
-if ( log.isErrorEnabled() ) log.error("Failed updating schema: " + 
e.getMessage());
+if ( log.isErrorEnabled() ) log.error("Failed creating schema 
update script", e);
 }
 finally {
 try {
@@ -360,7 +360,7 @@
 }
 catch (Exception e) {
 if ( log.isErrorEnabled() ) {
-log.error("Failed updating schema while executing query \"" + 
sql + "\":" + e.getMessage());
+log.error("Failed updating schema while executing query \"" + 
sql + "\"", e);
 }
 }
 finally {

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5312 - xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api

2007-10-06 Thread SVN
Author: tmortagne
Date: 2007-10-06 11:04:19 +0200 (Sat, 06 Oct 2007)
New Revision: 5312

Modified:
   
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
Log:
XWIKI-1779: Change getWikiName for getWiki to better follow getSpace and 
getName.

Modified: 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
===
--- 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
   2007-10-06 08:46:24 UTC (rev 5311)
+++ 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/api/Document.java
   2007-10-06 09:04:19 UTC (rev 5312)
@@ -124,7 +124,7 @@
 /**
  * @return the name of the wiki where this document is stored.
  */
-public String getWikiName()
+public String getWiki()
 {
 return doc.getDatabase();
 }
@@ -158,7 +158,7 @@
  */
 public String getPrefixedFullName()
 {
-return (getWikiName() != null ? getWikiName() + ":" : "") + 
getFullName();
+return (getWiki() != null ? getWiki() + ":" : "") + getFullName();
 }
 
 public Version getRCSVersion()

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5313 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api

2007-10-06 Thread SVN
Author: tmortagne
Date: 2007-10-06 11:04:32 +0200 (Sat, 06 Oct 2007)
New Revision: 5313

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
Log:
XWIKI-1779: Change getWikiName for getWiki to better follow getSpace and 
getName.

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
===
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
  2007-10-06 09:04:19 UTC (rev 5312)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/Document.java
  2007-10-06 09:04:32 UTC (rev 5313)
@@ -124,7 +124,7 @@
 /**
  * @return the name of the wiki where this document is stored.
  */
-public String getWikiName()
+public String getWiki()
 {
 return doc.getDatabase();
 }
@@ -158,7 +158,7 @@
  */
 public String getPrefixedFullName()
 {
-return (getWikiName() != null ? getWikiName() + ":" : "") + 
getFullName();
+return (getWiki() != null ? getWiki() + ":" : "") + getFullName();
 }
 
 public Version getRCSVersion()

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5314 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode

2007-10-06 Thread SVN
Author: tmortagne
Date: 2007-10-06 12:29:10 +0200 (Sat, 06 Oct 2007)
New Revision: 5314

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
Log:
Rename shared list of wiki from wikilist to allwikilist

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
 2007-10-06 09:04:32 UTC (rev 5313)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
 2007-10-06 10:29:10 UTC (rev 5314)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1190974436000
-1191596262000
-1191596262000
-1.43
+1191602683000
+1191602683000
+1.45
 
 
 
@@ -64,20 +64,20 @@
   #set($nb = 5)
 #end
 
-#if(!$wikilist)
-  #set($wikilist = $WikiManager.getWikiDocumentList())
+#if(!$allwikilist)
+  #set($allwikilist = $WikiManager.getWikiDocumentList())
 #end
 
-#if(!$creationsortedwikilist)
-  #sortDocumentByCreationDate($wikilist $creationsortedwikilist false)
+#if(!$creationsortedallwikilist)
+  #sortDocumentByCreationDate($allwikilist $creationsortedallwikilist false)
 #end
 
 #
 
 #widgetbegin($msg.get("wikimanager.widget.lastcreatedwikis.title"), "")
-#if(!$creationsortedwikilist.isEmpty())
+#if(!$creationsortedallwikilist.isEmpty())
   
-#foreach($wikidoc in $creationsortedwikilist)
+#foreach($wikidoc in $creationsortedallwikilist)
   #if($velocityCount < $nb)
 ;

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
 2007-10-06 09:04:32 UTC (rev 5313)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
 2007-10-06 10:29:10 UTC (rev 5314)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1190979406000
-1191596429000
-1191596429000
-1.52
+1191602533000
+1191602533000
+1.53
 
 
 
@@ -61,17 +61,17 @@
 #
 
 
-#if(!$wikilist)
-  #set($wikilist = $WikiManager.getWikiDocumentList())
+#if(!$allwikilist)
+  #set($allwikilist = $WikiManager.getWikiDocumentList())
 #end
 
 #
 
 #widgetbegin($msg.get("wikimanager.widget.userwikisadmin.title") "")
-#if(!$wikilist.isEmpty())
+#if(!$allwikilist.isEmpty())
   
http://$wikidoc.server
#set($currentwiki = $context.database) -#foreach($wikidoc in $wikilist) +#foreach($wikidoc in $allwikilist) $context.setDatabase($wikidoc.wikiName) #if($xwiki.hasAccessLevel("admin", "${currentwiki}:${context.localUser}", "XWiki.XWikiPreferences")) Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget === --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2007-10-06 09:04:32 UTC (rev 5313) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2007-10-06 10:29:10 UTC (rev 5314) @@ -12,9 +12,9 @@ XWiki.Admin 1190983998000 -1191596471000 -1191596471000 -1.10 +1191602583000 +1191602583000 +1.11 @@ -60,17 +60,16 @@ # -#if(!$wikilist) - #set($wikilist = $WikiManager.getWikiDocumentList()) +#if(!$allwikilist) + #set($allwikilist = $WikiManager.getWikiDocumentList()) #end # #widgetbegin($msg.get("wikimanager.widget.userwikisowner.title"), "") -#set($wikilist = $WikiManager.getWikiDocumentList()) -#if(!$wikilist.isEmpty()) +#if(!$allwikilist.isEmpty())
-#foreach($wikidoc in $wikilist) +#foreach($wikidoc in $allwikilist) #if($wikidoc.owner == $context.user) ; Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget =

[xwiki-notifications] r5315 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode

Author: tmortagne
Date: 2007-10-06 12:30:50 +0200 (Sat, 06 Oct 2007)
New Revision: 5315

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
Log:
Correct documents order in mixd wikis mode

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
 2007-10-06 10:29:10 UTC (rev 5314)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
 2007-10-06 10:30:50 UTC (rev 5315)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1191493346000
-1191596123000
-1191596123000
-1.51
+1191663165000
+1191663165000
+1.63
 
 
 
@@ -105,11 +105,20 @@
   #set($sql = "${sql} order by doc.date desc")
 
   #set ($list = $xwiki.searchDocuments($sql , $nb , 0))
-  
+ 
   #foreach($docname in $list)
 #if ($xwiki.hasAccessLevel("view", $context.user, 
"${context.database}:${docname}"))
   #set($item = $xwiki.getDocument($docname))
-  #set($added = $documentlist.add($item))
+  #set($added = false)
+  #foreach($sorteddoc in $documentlist)
+#if(!$added && $sorteddoc.date.before($item.date))
+  $documentlist.add($velocityCount, $item)
+  #set($added = true)
+#end
+  #end
+  #if(!$added)
+#set($added = $documentlist.add($item))
+  #end
 #end
   #end
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5316 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode

Author: tmortagne
Date: 2007-10-06 17:22:20 +0200 (Sat, 06 Oct 2007)
New Revision: 5316

Added:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
Log:
XAWM-17: Add box that list last documents modifications in all wikis ordered by 
modifications dates
XAWM-18: Add box that list last documents modifications made by current user in 
all wikis ordered by modifications dates

Added: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
(rev 0)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
2007-10-06 15:22:20 UTC (rev 5316)
@@ -0,0 +1,81 @@
+
+
+
+WikiCode
+LastWikiModificationsWidget
+
+en
+0
+
+XWiki.Admin
+XWiki.Admin
+
+XWiki.Admin
+1191508343000
+1191602308000
+1191602308000
+1.11
+
+
+
+
+
+
+
+XWiki.TagClass
+
+
+
+
+
+
+
+
+0
+input
+1
+tags
+1
+Tags
+1
+ 
+ ,|
+30
+0
+
+com.xpn.xwiki.objects.classes.StaticListClass
+
+
+WikiCode.LastWikiModificationsWidget
+0
+XWiki.TagClass
+
+
+
+
+#includeMacros("WikiCode.Macros")
+
+#set($WikiManager = $xwiki.wikimanager)
+#set($Exception = $WikiManager.DefaultException)
+
+#
+
+#if(!$allwikilist)
+  #set($allwikilist = $WikiManager.getWikiDocumentList())
+#end
+
+#if(!$allwikinamelist)
+  #set($allwikinamelist = [$context.mainWiki])
+  #foreach($wikidoc in $wikilist)
+#set($added = $allwikinamelist.add($wikidoc.wikiName))
+  #end
+#end
+
+#set($wikinamelist = $allwikinamelist)
+
+#
+
+#widgetbegin($msg.get("wikimanager.widget.lastmodifications.title"), "")
+  #includeInContext("WikiCode.LastWikiModificationsCode")
+#widgetend()
+

Added: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
  (rev 0)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
  2007-10-06 15:22:20 UTC (rev 5316)
@@ -0,0 +1,83 @@
+
+
+
+WikiCode
+MyLastWikiModificationsWidget
+
+en
+0
+
+XWiki.Admin
+XWiki.Admin
+
+XWiki.Admin
+119151500
+1191602692000
+1191602692000
+1.10
+
+
+
+
+
+
+
+XWiki.TagClass
+
+
+
+
+
+
+
+
+0
+input
+1
+tags
+1
+Tags
+1
+ 
+ ,|
+30
+0
+
+com.xpn.xwiki.objects.classes.StaticListClass
+
+
+WikiCode.MyLastWikiModificationsWidget
+0
+XWiki.TagClass
+
+
+
+
+#includeMacros("WikiCode.Macros")
+
+#set($WikiManager = $xwiki.wikimanager)
+#set($Exception = $WikiManager.DefaultException)
+
+#
+
+#if(!$wikilist)
+  #set($wikilist = $WikiManager.getWikiDocumentList())
+#end
+
+#if(!$allwikinamelist)
+  #set($allwikinamelist = [$context.mainWiki])
+  #foreach($wikidoc in $wikilist)
+#set($added = $allwikinamelist.add($wikidoc.wikiName))
+  #end
+#end
+
+#set($wikinamelist = $allwikinamelist)
+
+#
+
+#widgetbegin($msg.get("wikimanager.widget.mylastmodifications.title"), "")
+  #set($usermodifications = "${context.user}")
+  #set($usermodificationswiki = "${context.database}")
+  #includeInContext("WikiCode.LastWikiModificationsCode")
+#widgetend()
+

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5318 - xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross

Author: tmortagne
Date: 2007-10-08 19:46:11 +0200 (Mon, 08 Oct 2007)
New Revision: 5318

Modified:
   
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/style.css
Log:
XWIKI-1794: Improve default panels printing when in a page content to be used 
as dashboard.

Modified: 
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/style.css
===
--- 
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/style.css
2007-10-07 16:25:31 UTC (rev 5317)
+++ 
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/style.css
2007-10-08 17:46:11 UTC (rev 5318)
@@ -68,3 +68,90 @@
 #xwikieditcontent .accordionTabTitleBar h6 {
   width: 100%;
 }
+
+#xwikicontent .panel {
+   display: -moz-inline-box;
+   -moz-box-orient: vertical;
+   display: inline-block;
+   vertical-align: top;
+   word-wrap: break-word;
+   border: 1px solid;
+   margin: 0px 20px 20px 0px;
+   width: 300px;
+}
+
+* html #xwikicontent .panel {
+   display: inline;
+}
+
+*+html #xwikicontent .panel {
+   display: inline;
+}
+
+* html #xwikicontent .panel {
+   width: 300px;
+}
+
+#xwikicontent .panel {
+   display: -moz-inline-box;
+   -moz-box-orient: vertical;
+   display: inline-block;
+   vertical-align: top;
+   word-wrap: break-word;
+   border: 1px solid;
+   margin: 0px 20px 20px 0px;
+   width: 300px;
+}
+
+* html #xwikicontent .panel {
+   display: inline;
+}
+
+*+html #xwikicontent .panel {
+   display: inline;
+}
+
+* html #xwikicontent .panel {
+   width: 300px;
+}
+
+#xwikicontent .panel ul {
+   margin: 0 5px;
+   padding: 0;
+   list-style-position: inside;
+}
+
+#xwikicontent .panel .xwikipanelcontents {
+   background-color: transparent;
+}
+
+#xwikicontent .panel .xwikipanelcontents {
+   color: #333;
+}
+
+#xwikicontent .panel .xwikipanelcontents a {
+   color: #000;
+}
+
+#xwikicontent .panel .xwikipanelcontents a:hover {
+   color: #06F;
+}
+
+#xwikicontent .expanded .xwikipaneltitle {
+   background-color: #fff;
+   color: #000;
+   border-bottom: 1px solid #ddd;
+}
+
+#xwikicontent .collapsed .xwikipaneltitle {
+   background-color: #384554;
+   color: #fff;
+}
+
+#xwikicontent .expanded .xwikipaneltitle:hover {
+   color: #006ACC;
+}
+
+#xwikicontent .collapsed .xwikipaneltitle:hover {
+   color: #C0D4E7;
+}
\ No newline at end of file

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5319 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources

Author: tmortagne
Date: 2007-10-08 22:02:06 +0200 (Mon, 08 Oct 2007)
New Revision: 5319

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
Log:
XAWM-10: translations corrections

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
  2007-10-08 17:46:11 UTC (rev 5318)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
  2007-10-08 20:02:06 UTC (rev 5319)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1186671807000
-1191600072000
-1191600072000
-1.21
+1191858448000
+1191858448000
+1.22
 
 
 
@@ -87,8 +87,8 @@
 wikimanager.widget.userwikisadmin.title=Wikis you administrate
 wikimanager.widget.userwikisuser.title=Wikis you view
 wikimanager.widget.userwikisowner.title=Wikis you own
-wikimanager.widget.lastmodifications.title=Recent pages modifications
-wikimanager.widget.mylastmodifications.title=My recent pages modifications
+wikimanager.widget.lastmodifications.title=Recent modifications
+wikimanager.widget.mylastmodifications.title=My recent modifications
 
 # ANSWERS
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5320 - in xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources: XAppClasses XAppManager XAppSheets XAppTemplates

Author: tmortagne
Date: 2007-10-08 22:08:49 +0200 (Mon, 08 Oct 2007)
New Revision: 5320

Modified:
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
   
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate
Log:
XAAM-11: Some document don't not have the "parent" parameter correctly 
configured.

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
===
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
2007-10-08 20:02:06 UTC (rev 5319)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppClasses/XWikiApplicationClass
2007-10-08 20:08:49 UTC (rev 5320)
@@ -6,15 +6,15 @@
 
 en
 0
-
+XWiki.XWikiClasses
 
 XWiki.Admin
 
 XWiki.Admin
 1188210015000
-118846668
-1189614079000
-1.1
+1191861678000
+1191861678000
+1.2
 
 
 
@@ -195,5 +195,38 @@
 com.xpn.xwiki.objects.classes.StaticListClass
 
 
-
+
+
+XWiki.TagClass
+
+
+
+
+
+
+
+
+0
+input
+1
+tags
+1
+Tags
+1
+ 
+ ,|
+30
+0
+
+com.xpn.xwiki.objects.classes.StaticListClass
+
+
+XAppClasses.XWikiApplicationClass
+0
+XWiki.TagClass
+
+
+
+
+
 
\ No newline at end of file

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
===
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
  2007-10-08 20:02:06 UTC (rev 5319)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
  2007-10-08 20:08:49 UTC (rev 5320)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1186499908000
-1190919524000
-1190919524000
-1.28
+1191512101000
+1191512101000
+1.31
 
 
 
@@ -64,7 +64,6 @@
 #set($recurse = $request.getParameter("recurse"))
 #set($withversion = $request.getParameter("withversion"))
 
-
 1 $msg.get("xapp.appmanager")
 
 #

Modified: 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
===
--- 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2007-10-08 20:02:06 UTC (rev 5319)
+++ 
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppSheets/XWikiApplicationClassSheet
2007-10-08 20:08:49 UTC (rev 5320)
@@ -6,30 +6,63 @@
 
 
 0
-
+XAppClasses.XWikiApplicationClass
 
 XWiki.Admin
 
-
+XWiki.Admin
 1188210015000
-1188210015000
-1189614079000
-1.1
+1191861709000
+1191861709000
+1.5
 
 
 
 
 
-## you can modify this page to customize the presentation of your 
object
-
-1 Document $doc.name
-
-#set($class = $doc.getObject("XAppClasses.XWikiApplicationClass").xWikiClass)
-
-
- #foreach($prop in $class.properties) -
${prop.prettyName}
-
$doc.display($prop.getName())
- #end -
+ + +XWiki.TagClass + + + + + + + + +0 +input +1 +tags +1 +Tags +1 + + ,| +30 +0 + +com.xpn.xwiki.objects.classes.StaticListClass + + +XAppSheets.XWikiApplicationClassSheet +0 +XWiki.TagClass + + + + +## you can modify this page to customize the presentation of your object + +1 Document $doc.name + +#set($class = $doc.getObject("XAppClasses.XWikiApplicationClass").xWikiClass) + +
+ #foreach($prop in $class.properties) +
${prop.prettyName}
+
$doc.display($prop.getName())
+ #end +
\ No newline at end of file Modified: xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate === --- xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate 2007-10-08 20:02:06 UTC (rev 5319) +++ xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppTemplates/XWikiApplicationClassTemplate 2007-10-08 20:08:49 UTC (rev 5320) @@ -6,15 +6,15 @@ 0 - +XAppManager.WebHome XWiki.Admin - +XWiki.Admin 1188210015000 -1188210015000 -1189614079000 -1.1 +1191861828000 +1191861828000 +1.3 @@ -200,5 +200,38 @@ 0 XAppClasses.XWikiApplicationClass -#includeForm("XAppSheets.XWikiApplicationClassSheet") + + +XWiki.TagClass + + + + + + + + +0 +input +1 +tags +1 +Tags +1 + + ,| +30 +0 + +com.xpn.xwiki.objects.classes.Static

[xwiki-notifications] r5321 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki

Author: tmortagne
Date: 2007-10-08 22:11:26 +0200 (Mon, 08 Oct 2007)
New Revision: 5321

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClass
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassSheet
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassTemplate
Log:
XAWM-19: Some document does not have the "parent" parameter correctly 
configured.

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClass
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClass
  2007-10-08 20:08:49 UTC (rev 5320)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClass
  2007-10-08 20:11:26 UTC (rev 5321)
@@ -6,15 +6,15 @@
 
 
 0
-
+XWiki.XWikiClasses
 
 XWiki.Admin
 
-
+XWiki.Admin
 118787394
-118787394
-1189614079000
-1.1
+1191862158000
+1191862158000
+1.2
 
 
 
@@ -106,5 +106,38 @@
 com.xpn.xwiki.objects.classes.StaticListClass
 
 
-
+
+
+XWiki.TagClass
+
+
+
+
+
+
+
+
+0
+input
+1
+tags
+1
+Tags
+1
+ 
+ ,|
+30
+0
+
+com.xpn.xwiki.objects.classes.StaticListClass
+
+
+XWiki.XWikiServerClass
+0
+XWiki.TagClass
+
+
+
+
+
 
\ No newline at end of file

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassSheet
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassSheet
 2007-10-08 20:08:49 UTC (rev 5320)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassSheet
 2007-10-08 20:11:26 UTC (rev 5321)
@@ -6,30 +6,63 @@
 
 
 0
-
+XWiki.XWikiServerClass
 
 XWiki.Admin
 
-
+XWiki.Admin
 1187873943000
-1187873943000
-1189614079000
-1.1
+1191862182000
+1191862182000
+1.2
 
 
 
 
 
-## you can modify this page to customize the presentation of your 
object
-
-1 Document $doc.name
-
-#set($class = $doc.getObject("XWiki.XWikiServerClass").xWikiClass)
-
-
- #foreach($prop in $class.properties) -
${prop.prettyName}
-
$doc.display($prop.getName())
- #end -
+ + +XWiki.TagClass + + + + + + + + +0 +input +1 +tags +1 +Tags +1 + + ,| +30 +0 + +com.xpn.xwiki.objects.classes.StaticListClass + + +XWiki.XWikiServerClassSheet +0 +XWiki.TagClass + + + + +## you can modify this page to customize the presentation of your object + +1 Document $doc.name + +#set($class = $doc.getObject("XWiki.XWikiServerClass").xWikiClass) + +
+ #foreach($prop in $class.properties) +
${prop.prettyName}
+
$doc.display($prop.getName())
+ #end +
\ No newline at end of file Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassTemplate === --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassTemplate 2007-10-08 20:08:49 UTC (rev 5320) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassTemplate 2007-10-08 20:11:26 UTC (rev 5321) @@ -6,15 +6,15 @@ 0 - +WikiManager.WebHome XWiki.Admin - +XWiki.Admin 1187873943000 -1187873943000 -1189614079000 -1.1 +1191862203000 +1191862203000 +1.2 @@ -22,6 +22,39 @@ +XWiki.TagClass + + + + + + + + +0 +input +1 +tags +1 +Tags +1 + + ,| +30 +0 + +com.xpn.xwiki.objects.classes.StaticListClass + + +XWiki.XWikiServerClassTemplate +0 +XWiki.TagClass + + + + + + XWiki.XWikiServerClass @@ -111,5 +144,5 @@ 0 XWiki.XWikiServerClass -#includeForm("XWiki.XWikiServerClassSheet") +#includeForm("XWiki.XWikiServerClassSheet") \ No newline at end of file ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications

[xwiki-notifications] r5322 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode

Author: tmortagne
Date: 2007-10-08 22:13:36 +0200 (Mon, 08 Oct 2007)
New Revision: 5322

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
Log:
XAWM-12: Modify using XWIKI-1794
XAWM-13: Modify using XWIKI-1794
XAWM-14: Modify using XWIKI-1794
XAWM-15: Modify using XWIKI-1794
XAWM-16: Modify using XWIKI-1794
XAWM-17: Modify using XWIKI-1794
XAWM-18: Modify using XWIKI-1794

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
===
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
 2007-10-08 20:11:26 UTC (rev 5321)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
 2007-10-08 20:13:36 UTC (rev 5322)
@@ -6,15 +6,15 @@
 
 en
 0
-
+Panels.WebHome
 XWiki.Admin
 XWiki.Admin
 
 XWiki.Admin
-1190974436000
-1191602683000
-1191602683000
-1.45
+1191854731000
+1191860811000
+1191860811000
+1.8
 
 
 
@@ -22,6 +22,125 @@
 
 
 
+Panels.PanelClass
+
+
+
+
+
+
+
+
+0
+select
+0
+category
+5
+Category
+0
+ 
+ ,|
+1
+0
+Information|Navigation|Tools|Administration|Other
+com.xpn.xwiki.objects.classes.StaticListClass
+
+
+Text
+content
+4
+Content
+25
+60
+0
+com.xpn.xwiki.objects.classes.TextAreaClass
+
+
+Text
+description
+3
+Description
+5
+40
+0
+com.xpn.xwiki.objects.classes.TextAreaClass
+
+
+name
+1
+Name
+40
+0
+com.xpn.xwiki.objects.classes.StringClass
+
+
+0
+select
+0
+type
+2
+Panel type
+0
+ 
+ ,|
+1
+0
+view|edit
+com.xpn.xwiki.objects.classes.StaticListClass
+
+
+WikiCode.LastCreatedWikisWidget
+0
+Panels.PanelClass
+
+Information
+
+
+#panelheader($msg.get("wikimanager.widget.lastcreatedwikis.title"))
+
+  #includeMacros("WikiCode.Macros")
+
+  #set($WikiManager = $xwiki.wikimanager)
+  #set($Exception = $WikiManager.DefaultException)
+
+#
+
+  #if(!$nb)
+#set($nb = 5)
+  #end
+
+  #if(!$allwikilist)
+#set($allwikilist = $WikiManager.getWikiDocumentList())
+  #end
+
+  #if(!$creationsortedallwikilist)
+#sortDocumentByCreationDate($allwikilist $creationsortedallwikilist false)
+  #end
+
+#
+
+  #if(!$creationsortedallwikilist.isEmpty())
+#foreach($wikidoc in $creationsortedallwikilist)
+  #if($velocityCount < $nb)
+#displaymodification("http://$wikidoc.server"; "http://$wikidoc.server"; 
$wikidoc.creationDate $formatDate $wikidoc.creator true)
+  #end
+#end
+  #end
+
+#panelfooter()
+
+
+Panel Description
+
+
+LastCreatedWikisWidget
+
+
+view
+
+
+
+
 XWiki.TagClass
 
 
@@ -53,40 +172,5 @@
 
 
 
-#includeMacros("WikiCode.Macros")
-
-#set($WikiManager = $xwiki.wikimanager)
-#set($Exception = $WikiManager.DefaultException)
-
-#
-
-#if(!$nb)
-  #set($nb = 5)
-#end
-
-#if(!$allwikilist)
-  #set($allwikilist = $WikiManager.getWikiDocumentList())
-#end
-
-#if(!$creationsortedallwikilist)
-  #sortDocumentByCreationDate($allwikilist $creationsortedallwikilist false)
-#end
-
-#
-
-#widgetbegin($msg.get("wikimanager.widget.lastcreatedwikis.title"), "")
-#if(!$creationsortedallwikilist.isEmpty())
-  
http://$wikidoc.server
-#foreach($wikidoc in $creationsortedallwikilist) - #if($velocityCount < $nb) - - ; - - - - #end -#end -
http://$wikidoc.server[$wikidoc.creator]$wikidoc.creationDate
-#end -#widgetend() - \ No newline at end of file +#includeForm("Panels.PanelSheet") + Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode === --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode 2007-10-08 20:11:26 UTC (rev 5321) +++ xwiki-platform

[xwiki-notifications] r5323 - xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes

2007-10-08 Thread SVN
Author: tmortagne
Date: 2007-10-08 22:28:46 +0200 (Mon, 08 Oct 2007)
New Revision: 5323

Modified:
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocument.java
Log:
XAAM-13: New SuperDocument get his "parent" from template document.

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocument.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocument.java
 2007-10-08 20:13:36 UTC (rev 5322)
+++ 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocument.java
 2007-10-08 20:28:46 UTC (rev 5323)
@@ -87,7 +87,7 @@
 object.merge(templateObject);
 
 if (super.isNew()) {
-setParent(this.sclass.getClassFullName());
+setParent(docTemplate.getParent());
 setContent(docTemplate.getContent());
 }
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5324 - xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes

2007-10-09 Thread SVN
Author: tmortagne
Date: 2007-10-09 10:41:57 +0200 (Tue, 09 Oct 2007)
New Revision: 5324

Modified:
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/AbstractSuperClass.java
Log:
XAAM-12: By default the new class document parent of a SuperClass is set to 
XWiki.XWikiClasses and template/sheet document parent to class document.
XAAM-14: Add method to override for AbstractSuperClass extended classes to able 
to modify initialize some specifics in the class template document.

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/AbstractSuperClass.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/AbstractSuperClass.java
   2007-10-08 20:28:46 UTC (rev 5323)
+++ 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/AbstractSuperClass.java
   2007-10-09 08:41:57 UTC (rev 5324)
@@ -133,6 +133,11 @@
  */
 private final String classTemplateDefaultContent;
 
+/**
+ * FullName of the default parent page for a document containing xwiki 
class.
+ */
+private final String DEFAULT_XWIKICLASS_PARENT = "XWiki.XWikiClasses";
+
 public String getClassSpacePrefix()
 {
 return CLASS_SPACE_PREFIX;
@@ -352,6 +357,7 @@
 doc = new XWikiDocument();
 doc.setSpace(getClassSpace());
 doc.setName(getClassName());
+doc.setParent(DEFAULT_XWIKICLASS_PARENT);
 needsUpdate = true;
 }
 
@@ -391,6 +397,7 @@
 doc = new XWikiDocument();
 doc.setSpace(getClassSheetSpace());
 doc.setName(getClassSheetName());
+doc.setParent(getClassFullName());
 needsUpdate = true;
 }
 
@@ -441,13 +448,26 @@
 
 if (doc.isNew()) {
 doc.setContent(getClassTemplateDefaultContent());
+doc.setParent(getClassFullName());
 }
 
+needsUpdate |= updateClassTemplateDocument(doc);
+
 if (doc.isNew() || needsUpdate)
 xwiki.saveDocument(doc, context);
 }
 
 /**
+ * Initialize template document with default content.
+ * 
+ * @param doc the class template document that will be saved.
+ */
+protected boolean updateClassTemplateDocument(XWikiDocument doc)
+{
+return false;
+}
+
+/**
  * Configure BaseClass.
  * 
  * @param baseClass the baseClass to configure.

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5325 - xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc

2007-10-09 Thread SVN
Author: tmortagne
Date: 2007-10-09 10:46:14 +0200 (Tue, 09 Oct 2007)
New Revision: 5325

Modified:
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
   
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
Log:
XAAM-15: Modify XWikiApplication(Class) to use XAAM-14

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
  2007-10-09 08:41:57 UTC (rev 5324)
+++ 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplication.java
  2007-10-09 08:46:14 UTC (rev 5325)
@@ -61,30 +61,6 @@
 super(XWikiApplicationClass.getInstance(context), xdoc, context);
 }
 
-/**
- * [EMAIL PROTECTED]
- * 
- * Add some specifics action for Application Manager descriptors document.
- * 
- *  Initialize application version to "1.0".
- *  Set descriptor document default parent to Application Manager home 
page :
- * XAppManager.WebHome.
- * 
- * 
- * @see 
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.DefaultSuperDocument#reload(com.xpn.xwiki.XWikiContext)
- */
-public void reload(XWikiContext context) throws XWikiException
-{
-super.reload(context);
-
-if (getAppVersion().length() == 0)
-setAppVersion("1.0");
-
-if (super.isNew())
-// set Application Manager home as default parent for all 
applications descriptors
-setParent(sclass.getClassSpacePrefix() + "Manager.WebHome");
-}
-
 // ///
 
 /**

Modified: 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
 2007-10-09 08:41:57 UTC (rev 5324)
+++ 
xwiki-platform/xwiki-plugins/trunk/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
 2007-10-09 08:46:14 UTC (rev 5325)
@@ -196,7 +196,7 @@
 {
 super(CLASS_SPACE_PREFIX, CLASS_PREFIX);
 }
-
+
 /**
  * [EMAIL PROTECTED]
  * 
@@ -261,7 +261,7 @@
 
 needsUpdate = true;
 }
- 
+
 if (baseClass.addStaticListField(FIELD_docstolink, FIELDPN_docstolink, 
80, true, "",
 "input")) {
 
@@ -292,6 +292,28 @@
 }
 
 /**
+ * [EMAIL PROTECTED]
+ * 
+ * @see 
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractSuperClass#updateClassTemplateDocument(com.xpn.xwiki.doc.XWikiDocument)
+ */
+protected boolean updateClassTemplateDocument(XWikiDocument doc)
+{
+boolean needsUpdate = false;
+
+if ((getClassSpacePrefix() + 
"Manager.WebHome").equals(doc.getParent())) {
+doc.setParent(getClassSpacePrefix() + "Manager.WebHome");
+needsUpdate = true;
+}
+
+if ("1.0".equals(doc.getStringValue(getClassFullName(), 
FIELD_appversion))) {
+doc.setStringValue(getClassFullName(), FIELD_appversion, "1.0");
+needsUpdate = true;
+}
+
+return needsUpdate;
+}
+
+/**
  * Get the XWiki document descriptor of containing 
XAppClasses.XWikiApplication XWiki object
  * with "appname" field equals to appName.
  * 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5326 - xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc

2007-10-09 Thread SVN
Author: tmortagne
Date: 2007-10-09 10:47:44 +0200 (Tue, 09 Oct 2007)
New Revision: 5326

Modified:
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
   
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServerClass.java
Log:
XAWM-20: Modify XWikiServer(Class) to use XAAM-14

Modified: 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
 2007-10-09 08:46:14 UTC (rev 5325)
+++ 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServer.java
 2007-10-09 08:47:44 UTC (rev 5326)
@@ -35,7 +35,7 @@
 {
 super(XWikiServerClass.getInstance(context), xdoc, context);
 }
-
+
 public void delete() throws XWikiException
 {
 super.delete(context);

Modified: 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServerClass.java
===
--- 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServerClass.java
2007-10-09 08:46:14 UTC (rev 5325)
+++ 
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/doc/XWikiServerClass.java
2007-10-09 08:47:44 UTC (rev 5326)
@@ -194,7 +194,24 @@
 
 return needsUpdate;
 }
+
+/**
+ * [EMAIL PROTECTED]
+ * 
+ * @see 
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractSuperClass#updateClassTemplateDocument(com.xpn.xwiki.doc.XWikiDocument)
+ */
+protected boolean updateClassTemplateDocument(XWikiDocument doc)
+{
+boolean needsUpdate = false;
 
+if ("WikiManager.WebHome".equals(doc.getParent())) {
+doc.setParent(getClassSpacePrefix() + "Manager.WebHome");
+needsUpdate = true;
+}
+
+return needsUpdate;
+}
+
 private XWikiDocument getWikiServerDocument(String wikiName, XWikiContext 
context,
 boolean validate) throws XWikiException
 {

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5327 - xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross

2007-10-09 Thread SVN
Author: tmortagne
Date: 2007-10-09 10:59:03 +0200 (Tue, 09 Oct 2007)
New Revision: 5327

Modified:
   xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/style.css
Log:
XWIKI-1794: Improve panel printing in page.

Modified: 
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/style.css
===
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/style.css 
2007-10-09 08:47:44 UTC (rev 5326)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/style.css 
2007-10-09 08:59:03 UTC (rev 5327)
@@ -68,3 +68,90 @@
 #xwikieditcontent .accordionTabTitleBar h6 {
   width: 100%;
 }
+
+#xwikicontent .panel {
+   display: -moz-inline-box;
+   -moz-box-orient: vertical;
+   display: inline-block;
+   vertical-align: top;
+   word-wrap: break-word;
+   border: 1px solid;
+   margin: 0px 20px 20px 0px;
+   width: 300px;
+}
+
+* html #xwikicontent .panel {
+   display: inline;
+}
+
+*+html #xwikicontent .panel {
+   display: inline;
+}
+
+* html #xwikicontent .panel {
+   width: 300px;
+}
+
+#xwikicontent .panel {
+   display: -moz-inline-box;
+   -moz-box-orient: vertical;
+   display: inline-block;
+   vertical-align: top;
+   word-wrap: break-word;
+   border: 1px solid;
+   margin: 0px 20px 20px 0px;
+   width: 300px;
+}
+
+* html #xwikicontent .panel {
+   display: inline;
+}
+
+*+html #xwikicontent .panel {
+   display: inline;
+}
+
+* html #xwikicontent .panel {
+   width: 300px;
+}
+
+#xwikicontent .panel ul {
+   margin: 0 5px;
+   padding: 0;
+   list-style-position: inside;
+}
+
+#xwikicontent .panel .xwikipanelcontents {
+   background-color: transparent;
+}
+
+#xwikicontent .panel .xwikipanelcontents {
+   color: #333;
+}
+
+#xwikicontent .panel .xwikipanelcontents a {
+   color: #000;
+}
+
+#xwikicontent .panel .xwikipanelcontents a:hover {
+   color: #06F;
+}
+
+#xwikicontent .expanded .xwikipaneltitle {
+   background-color: #fff;
+   color: #000;
+   border-bottom: 1px solid #ddd;
+}
+
+#xwikicontent .collapsed .xwikipaneltitle {
+   background-color: #384554;
+   color: #fff;
+}
+
+#xwikicontent .expanded .xwikipaneltitle:hover {
+   color: #006ACC;
+}
+
+#xwikicontent .collapsed .xwikipaneltitle:hover {
+   color: #C0D4E7;
+}
\ No newline at end of file

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


[xwiki-notifications] r5328 - xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main

2007-10-09 Thread SVN
Author: tmortagne
Date: 2007-10-09 14:35:50 +0200 (Tue, 09 Oct 2007)
New Revision: 5328

Modified:
   
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
Log:
XEM-61: Add informations dashboards on main page.

Modified: 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
===
--- 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
   2007-10-09 08:59:03 UTC (rev 5327)
+++ 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
   2007-10-09 12:35:50 UTC (rev 5328)
@@ -12,9 +12,9 @@
 
 XWiki.Admin
 1166007764000
-1189768336000
-1189768336000
-1.3
+1191863154000
+1191863154000
+1.34
 
 
 
@@ -53,37 +53,53 @@
 
 
 
-1 Welcome to your wiki administrator
-
-Welcome to the wiki administrator of your wiki farm! It is a space that will 
allow you to create as wiki as you want and manage it. Each wiki you will 
create is a shared workspace that will allow you to collaborate effectively 
with others. You will be able to use it for many purposes:
-
-* Project Management
-* Collaborative Writing
-* Efficient Document Sharing
-* Knowledge Management
-
-... now combine all this uses and the possibility to create as wiki as you 
want and you have XWiki Entreprise Manager.
-
-1 One farm, 3 types of XWiki
-
-* Wiki administrator : you are on it, it's the wiki to manage your farm
-* Wiki templates : models of wikis used when you create a new wiki instance
-* Wiki instances : a wiki created from a wiki template and on which users will 
work !
-
-
-1 How to start
-
-Because you are on the wiki administrator, the steps that you may want to go 
through are :
-
-* Go to the [Installation>XemManager.Install] page to check if all you need 
is correct.
-* Creating a new wiki on your farm by clicking on the [Create a new 
wiki>WikiManager.CreateNewWiki] link
-* Managing the existing wikis of your farms by clicking on the [Wiki 
Farm>WikiManager.WebHome] link
-* Changing your general farm settings by clicking on the "Administration" link
-
-For more information you can visit the documentation on xwiki.org.
-
-This XWiki is yours, we hope you'll enjoy it ...
-
-Congratulations,
+1 Welcome to your wiki administrator
+
+Welcome to the wiki administrator of your wiki farm! It is a space that will 
allow you to create as wiki as you want and manage it. Each wiki you will 
create is a shared workspace that will allow you to collaborate effectively 
with others. You will be able to use it for many purposes:
+
+* Project Management
+* Collaborative Writing
+* Efficient Document Sharing
+* Knowledge Management
+
+... now combine all this uses and the possibility to create as wiki as you 
want and you have XWiki Entreprise Manager.
+
+1 One farm, 3 types of XWiki
+
+* Wiki administrator : you are on it, it's the wiki to manage your farm
+* Wiki templates : models of wikis used when you create a new wiki instance
+* Wiki instances : a wiki created from a wiki template and on which users will 
work !
+
+1 Informations
+
+#
+
+#includeMacros("WikiCode.Macros")
+#set($WikiManager = $xwiki.wikimanager)
+
+#set($nb = 5)
+#set($wikilist = $WikiManager.getWikiDocumentList())
+#sortDocumentByCreationDate($wikilist $creationsortedwikilist false)
+
+#
+
+#displaypanel('WikiCode.UserWikisIsAdminWidget') 
#displaypanel('WikiCode.UserWikisIsUserWidget') 
#displaypanel('WikiCode.UserWikisIsOwnerWidget') 
#displaypanel('WikiCode.MyLastWikiModificationsWidget') 
#displaypanel('WikiCode.LastWikiModificationsWidget') 
#displaypanel('WikiCode.LastCreatedWikisWidget')
+
+#
+
+1 How to start
+
+Because you are on the wiki administrator, the steps that you may want to go 
through are :
+
+* Go to the [Installation>XemManager.Install] page to check if all you need 
is correct.
+* Creating a new wiki on your farm by clicking on the [Create a new 
wiki>WikiManager.CreateNewWiki] link
+* Managing the existing wikis of your farms by clicking on the [Wiki 
Farm>WikiManager.WebHome] link
+* Changing your general farm settings by clicking on the "Administration" link
+
+For more information you can visit the documentation on xwiki.org.
+
+This XWiki is yours, we hope you'll enjoy it ...
+
+Congratulations,
 The XWiki Team
 

___
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications


  1   2   3   4   5   6   7   8   9   10   >