Menu
▾
▴
mmapps-cvs — cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(3) |
Oct
(191) |
Nov
(124) |
Dec
(74) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(20) |
Mar
(38) |
Apr
(67) |
May
(18) |
Jun
(6) |
Jul
(27) |
Aug
|
Sep
(20) |
Oct
(7) |
Nov
(5) |
Dec
(21) |
| 2006 |
Jan
(4) |
Feb
(4) |
Mar
(8) |
Apr
(26) |
May
(6) |
Jun
(17) |
Jul
(12) |
Aug
(3) |
Sep
(3) |
Oct
(10) |
Nov
|
Dec
(7) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
(3) |
Jun
(8) |
Jul
|
Aug
|
Sep
(12) |
Oct
|
Nov
(10) |
Dec
(3) |
| 2008 |
Jan
(8) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
|
From: Kees J. <ke...@us...> - 2009-11-08 20:09:10
|
Update of /cvsroot/mmapps/mmapps/simplexml/src/simplexml In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24104/simplexml/src/simplexml Modified Files: XMLElement.java Log Message: Make simplexml compile against java 1.6. adapted the configuration reader to work with the new data types Index: XMLElement.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/simplexml/src/simplexml/XMLElement.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XMLElement.java 22 Jun 2005 13:22:04 -0000 1.3 --- XMLElement.java 8 Nov 2009 20:08:51 -0000 1.4 *************** *** 1501,1509 **** if (!this.attributes.isEmpty()) { ! Enumeration enum = this.attributes.keys(); ! while (enum.hasMoreElements()) { out.print(' '); ! String key = (String) (enum.nextElement()); String value = (String) (this.attributes.get(key)); out.print(key); --- 1501,1509 ---- if (!this.attributes.isEmpty()) { ! Enumeration item = this.attributes.keys(); ! while (item.hasMoreElements()) { out.print(' '); ! String key = (String) (item.nextElement()); String value = (String) (this.attributes.get(key)); out.print(key); *************** *** 1539,1546 **** } else { out.println('>'); ! Enumeration enum = this.enumerateChildren(); ! while (enum.hasMoreElements()) { ! XMLElement child = (XMLElement) (enum.nextElement()); child.write(writer, indent + 4); } --- 1539,1546 ---- } else { out.println('>'); ! Enumeration item = this.enumerateChildren(); ! while (item.hasMoreElements()) { ! XMLElement child = (XMLElement) (item.nextElement()); child.write(writer, indent + 4); } *************** *** 1664,1670 **** XMLElement xmle = new XMLElement(); xmle.setTagName(getTagName()); ! Enumeration enum = attributes.propertyNames(); ! while (enum.hasMoreElements()) { ! String propName = (String) enum.nextElement(); xmle.addProperty(propName, getProperty(propName)); } --- 1664,1670 ---- XMLElement xmle = new XMLElement(); xmle.setTagName(getTagName()); ! Enumeration item = attributes.propertyNames(); ! while (item.hasMoreElements()) { ! String propName = (String) item.nextElement(); xmle.addProperty(propName, getProperty(propName)); } |
|
From: Kees J. <ke...@us...> - 2009-11-08 20:08:59
|
Update of /cvsroot/mmapps/mmapps/mmbaseconfig/src/net/sf/mmapps/modules/config In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24104/mmbaseconfig/src/net/sf/mmapps/modules/config Modified Files: ConfigurationXMLReader.java Log Message: Make simplexml compile against java 1.6. adapted the configuration reader to work with the new data types Index: ConfigurationXMLReader.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmbaseconfig/src/net/sf/mmapps/modules/config/ConfigurationXMLReader.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ConfigurationXMLReader.java 7 Nov 2004 15:32:31 -0000 1.4 --- ConfigurationXMLReader.java 8 Nov 2009 20:08:51 -0000 1.5 *************** *** 156,159 **** --- 156,163 ---- public static FieldConfiguration createFieldConfiguration(Configuration config,XMLElement xmlField) { FieldConfiguration conf = config.createFieldConfiguration(); + + if (xmlField.getProperty("name") != null) { + conf.setName(xmlField.getProperty("name")); + } Iterator iter = xmlField.getChildren().iterator(); while (iter.hasNext()) { *************** *** 228,231 **** --- 232,239 ---- } } + } else if (child.getTagName().equals("datatype")) { + if (child.getProperty("base") != null) { + conf.setType(child.getProperty("base")); + } } } |
|
From: Nico K. <nkl...@us...> - 2008-06-30 13:44:05
|
Update of /cvsroot/mmapps/mmapps/remotepublishing/src/org/mmbase/remotepublishing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25075/src/org/mmbase/remotepublishing Modified Files: PublishManager.java Log Message: isVirtaul check on fields before cloning Index: PublishManager.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/remotepublishing/src/org/mmbase/remotepublishing/PublishManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PublishManager.java 22 Dec 2007 17:55:00 -0000 1.9 --- PublishManager.java 30 Jun 2008 13:44:01 -0000 1.10 *************** *** 261,265 **** } else { ! if (sourceNode.getNodeManager().getField(fieldName).getState() != Field.STATE_SYSTEM) { destinationNode.setValueWithoutProcess(fieldName, sourceNode.getValueWithoutProcess(fieldName)); --- 261,266 ---- } else { ! Field sourceField = sourceNode.getNodeManager().getField(fieldName); ! if (sourceField.getState() != Field.STATE_SYSTEM && !sourceField.isVirtual()) { destinationNode.setValueWithoutProcess(fieldName, sourceNode.getValueWithoutProcess(fieldName)); |
|
From: Nico K. <nkl...@us...> - 2008-06-30 13:44:05
|
Update of /cvsroot/mmapps/mmapps/remotepublishing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25075 Modified Files: project.xml Log Message: isVirtaul check on fields before cloning Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/remotepublishing/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** project.xml 22 Dec 2007 18:14:39 -0000 1.12 --- project.xml 30 Jun 2008 13:44:01 -0000 1.13 *************** *** 5,9 **** <artifactId>remotepublishing</artifactId> <name>MMBase Remote Publishing</name> ! <currentVersion>1.0.15-SNAPSHOT</currentVersion> <package>org.mmbase.remotepublishing</package> <shortDescription>The MMBase Remote Publishing module provides a way to clone nodes from one cloud to the other</shortDescription> --- 5,9 ---- <artifactId>remotepublishing</artifactId> <name>MMBase Remote Publishing</name> ! <currentVersion>1.0.15</currentVersion> <package>org.mmbase.remotepublishing</package> <shortDescription>The MMBase Remote Publishing module provides a way to clone nodes from one cloud to the other</shortDescription> |
|
From: Nico K. <nkl...@us...> - 2008-06-30 13:43:19
|
Update of /cvsroot/mmapps/mmapps/mmcommons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24954/mmcommons Modified Files: project.xml Log Message: 1.4.3 Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** project.xml 14 Jan 2008 22:26:00 -0000 1.15 --- project.xml 30 Jun 2008 13:43:14 -0000 1.16 *************** *** 6,10 **** <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.3-SNAPSHOT</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> --- 6,10 ---- <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.3</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> *************** *** 21,25 **** <groupId>mmbase</groupId> <artifactId>mmbase</artifactId> ! <version>1.8.4-20070502</version> <url>http://www.mmbase.org/</url> </dependency> --- 21,25 ---- <groupId>mmbase</groupId> <artifactId>mmbase</artifactId> ! <version>1.8.6-20080502</version> <url>http://www.mmbase.org/</url> </dependency> |
|
From: Nico K. <nkl...@us...> - 2008-06-30 13:42:47
|
Update of /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/web In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24310/mmcommons/src/java/net/sf/mmapps/commons/web Modified Files: FriendlyUrlFilter.java CloudThreadFilter.java Log Message: remove warnings Index: FriendlyUrlFilter.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/web/FriendlyUrlFilter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FriendlyUrlFilter.java 25 May 2007 12:58:45 -0000 1.4 --- FriendlyUrlFilter.java 30 Jun 2008 13:42:41 -0000 1.5 *************** *** 84,88 **** } } catch(IOException ioe) { ! if (ioe.getMessage().indexOf("Broken pipe") > -1) { log.info("IO error " + ioe.getMessage()); } --- 84,88 ---- } } catch(IOException ioe) { ! if (ioe.getMessage() != null && ioe.getMessage().indexOf("Broken pipe") > -1) { log.info("IO error " + ioe.getMessage()); } Index: CloudThreadFilter.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/web/CloudThreadFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CloudThreadFilter.java 20 Sep 2007 18:24:27 -0000 1.2 --- CloudThreadFilter.java 30 Jun 2008 13:42:42 -0000 1.3 *************** *** 20,24 **** * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) */ - @SuppressWarnings("unused") public void init(FilterConfig config) { // nix --- 20,23 ---- |
|
From: Nico K. <nkl...@us...> - 2008-06-30 13:42:14
|
Update of /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/util In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24066/mmcommons/src/java/net/sf/mmapps/commons/util Modified Files: HttpUtil.java Log Message: Only add port when not standard Index: HttpUtil.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/util/HttpUtil.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** HttpUtil.java 20 Sep 2007 18:24:27 -0000 1.7 --- HttpUtil.java 30 Jun 2008 13:42:09 -0000 1.8 *************** *** 104,111 **** public static String getWebappUri(HttpServletRequest request, String serverName, boolean forceSecure) { String scheme = forceSecure ? "https" : request.getScheme(); - StringBuffer s = new StringBuffer(); ! s.append(scheme).append("://").append(serverName).append(':').append( ! Integer.toString(request.getServerPort())).append(request.getContextPath()).append('/'); return s.toString(); } --- 104,116 ---- public static String getWebappUri(HttpServletRequest request, String serverName, boolean forceSecure) { String scheme = forceSecure ? "https" : request.getScheme(); StringBuffer s = new StringBuffer(); ! s.append(scheme).append("://").append(serverName); ! ! int serverPort = request.getServerPort(); ! if (serverPort != 80 && serverPort != 443 ) { ! s.append(':').append(Integer.toString(serverPort)); ! } ! ! s.append(request.getContextPath()).append('/'); return s.toString(); } |
|
From: Nico K. <nkl...@us...> - 2008-06-30 13:41:44
|
Update of /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/beans In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23532/mmcommons/src/java/net/sf/mmapps/commons/beans Modified Files: MMBaseNodeMapper.java Log Message: only read field when writable Index: MMBaseNodeMapper.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/beans/MMBaseNodeMapper.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MMBaseNodeMapper.java 14 Jan 2008 22:24:43 -0000 1.5 --- MMBaseNodeMapper.java 30 Jun 2008 13:41:36 -0000 1.6 *************** *** 34,73 **** while (fli.hasNext()) { Field f = fli.nextField(); ! String fname = f.getName(); ! Object v = null; ! if (!fname.equalsIgnoreCase("number") && f.getType() == Field.TYPE_NODE) { ! v = node.getNodeValue(fname); ! } ! else { ! v = node.getObjectValue(fname); ! } ! ! if (fname.equalsIgnoreCase("number")) { ! fname = "id"; ! } else if (fname.equalsIgnoreCase("otype")) { ! fname = "nodeType"; ! v = getOType(v); ! } ! if (v != null && fname != null) { ! if (PropertyUtils.isWriteable(nodeClass, fname)) { ! try { ! PropertyUtils.setProperty(nodeClass, fname, v); ! } catch (IllegalArgumentException e) { ! log.error("IllegalArgumentException for Node '" + node.getNumber() ! + "' on Class '" + nodeClass.getClass().getName() ! + "' on fieldname '" + fname + "'"); ! throw e; ! } catch (IllegalAccessException e) { ! log.error("IllegalAccessException for Node '" + node.getNumber() ! + "' on Class '" + nodeClass.getClass().getName() ! + "' on fieldname '" + fname + "'"); ! } catch (InvocationTargetException e) { ! log.error("InvocationTargetException for Node '" + node.getNumber() ! + "' on fieldname '" + fname + "'"); ! } catch (NoSuchMethodException e) { ! log.error("NoSuchMethodException for Node '" + node.getNumber() ! + "' on fieldname '" + fname + "'"); ! } } else { //log.warn("Property '" + fname + "' doesn't exist or not writable"); --- 34,80 ---- while (fli.hasNext()) { Field f = fli.nextField(); ! String mmname = f.getName(); ! String pojoname = mmname; ! ! if (mmname.equalsIgnoreCase("number")) { ! pojoname = "id"; ! } else if (mmname.equalsIgnoreCase("otype")) { ! pojoname = "nodeType"; ! } ! if (pojoname != null) { ! if (PropertyUtils.isWriteable(nodeClass, pojoname)) { ! Object v = null; ! if (mmname.equalsIgnoreCase("otype")) { ! v = node.getObjectValue(mmname); ! v = getOType(v); ! } else { ! if (!mmname.equalsIgnoreCase("number") && f.getType() == Field.TYPE_NODE) { ! v = node.getNodeValue(mmname); ! } else { ! v = node.getObjectValue(mmname); ! } ! } ! ! if (v != null) { ! try { ! PropertyUtils.setProperty(nodeClass, pojoname, v); ! } catch (IllegalArgumentException e) { ! log.error("IllegalArgumentException for Node '" + node.getNumber() ! + "' on Class '" + nodeClass.getClass().getName() ! + "' on fieldname '" + mmname + "'"); ! throw e; ! } catch (IllegalAccessException e) { ! log.error("IllegalAccessException for Node '" + node.getNumber() ! + "' on Class '" + nodeClass.getClass().getName() ! + "' on fieldname '" + mmname + "'"); ! } catch (InvocationTargetException e) { ! log.error("InvocationTargetException for Node '" + node.getNumber() ! + "' on fieldname '" + mmname + "'"); ! } catch (NoSuchMethodException e) { ! log.error("NoSuchMethodException for Node '" + node.getNumber() ! + "' on fieldname '" + mmname + "'"); ! } ! } } else { //log.warn("Property '" + fname + "' doesn't exist or not writable"); *************** *** 106,113 **** } catch (InstantiationException e) { log.error("InstantiationException for Node '" + node.getNumber() + "' on Class '" ! + nodeClass.getClass().getName() + "'"); } catch (IllegalAccessException e) { log.error("IllegalAccessException for Node '" + node.getNumber() + "' on Class '" ! + nodeClass.getClass().getName() + "'"); } } --- 113,120 ---- } catch (InstantiationException e) { log.error("InstantiationException for Node '" + node.getNumber() + "' on Class '" ! + clazz.getName() + "'"); } catch (IllegalAccessException e) { log.error("IllegalAccessException for Node '" + node.getNumber() + "' on Class '" ! + clazz.getName() + "'"); } } |
|
From: Nico K. <nkl...@us...> - 2008-06-30 12:14:39
|
Update of /cvsroot/mmapps/mmapps/remotepublishing/src/org/mmbase/remotepublishing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11466/src/org/mmbase/remotepublishing Modified Files: CloudInfo.java Log Message: NPE check Index: CloudInfo.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/remotepublishing/src/org/mmbase/remotepublishing/CloudInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CloudInfo.java 18 Apr 2007 07:48:28 -0000 1.2 --- CloudInfo.java 30 Jun 2008 12:14:28 -0000 1.3 *************** *** 72,82 **** private static CloudInfo getCloudInfo(Node localCloudNode) { if (instanceMap.containsKey(localCloudNode.getNumber())){ return instanceMap.get(localCloudNode.getNumber()); } - if (localCloudNode == null) { - throw new BridgeException("can not find cloud with number(" + localCloudNode.getNumber() - + ") in default admin cloud "); - } if (CLOUD.equals(localCloudNode.getNodeManager().getName()) == false) { throw new BridgeException("the node(" + localCloudNode.getNumber() --- 72,81 ---- private static CloudInfo getCloudInfo(Node localCloudNode) { + if (localCloudNode == null) { + throw new BridgeException("Local cloud node is null"); + } if (instanceMap.containsKey(localCloudNode.getNumber())){ return instanceMap.get(localCloudNode.getNumber()); } if (CLOUD.equals(localCloudNode.getNodeManager().getName()) == false) { throw new BridgeException("the node(" + localCloudNode.getNumber() |
|
From: Nico K. <nkl...@us...> - 2008-06-30 12:12:06
|
Update of /cvsroot/mmapps/mmapps/remotepublishing/config/applications/Publisher/builders In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8625/remotepublishing/config/applications/Publisher/builders Modified Files: remotenodes.xml Log Message: lastmodified is a system field Index: remotenodes.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/remotepublishing/config/applications/Publisher/builders/remotenodes.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** remotenodes.xml 18 Apr 2007 07:50:11 -0000 1.4 --- remotenodes.xml 30 Jun 2008 12:11:46 -0000 1.5 *************** *** 55,59 **** <db> <name>timestamp</name> ! <type key="false" notnull="false" state="persistent">DATETIME</type> </db> </field> --- 55,59 ---- <db> <name>timestamp</name> ! <type key="false" notnull="false" state="system">DATETIME</type> </db> </field> |
|
From: Nico K. <nkl...@us...> - 2008-03-21 10:23:15
|
Update of /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16156/maven-mmbase-module-plugin Modified Files: plugin.jelly project.xml plugin.properties Log Message: Add mmbase 1.9 block support Index: plugin.properties =================================================================== RCS file: /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin/plugin.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plugin.properties 5 Sep 2005 09:32:59 -0000 1.1 --- plugin.properties 21 Mar 2008 10:22:32 -0000 1.2 *************** *** 1,2 **** --- 1,9 ---- + # This software is OSI Certified Open Source Software. + # OSI Certified is a certification mark of the Open Source Initiative. + # + # The license (Mozilla version 1.0) can be read at the MMBase site. + # See http://www.MMBase.org/license + # + #------------------------------------------------------------------------------ # P L U G I N P R O P E R T I E S *************** *** 7,10 **** --- 14,18 ---- maven.mmbasemodule.config=${maven.mmbasemodule.src}/config maven.mmbasemodule.examples=${maven.mmbasemodule.src}/examples + maven.mmbasemodule.blocks=${maven.mmbasemodule.src}/blocks maven.mmbasemodule.final.name=${maven.final.name} *************** *** 17,20 **** --- 25,29 ---- maven.mmbasemodule.templates.dir=templates maven.mmbasemodule.examples.dir=examples + maven.mmbasemodule.blocks.dir=blocks maven.mmbasemodule.src.includes=${maven.war.src.includes} *************** *** 26,29 **** maven.mmbasemodule.examples.includes=** maven.mmbasemodule.examples.excludes= ! maven.mmbasemodule.repo=http://mmapps.sourceforge.net/distributions/ \ No newline at end of file --- 35,42 ---- maven.mmbasemodule.examples.includes=** maven.mmbasemodule.examples.excludes= + maven.mmbasemodule.blocks.includes=** + maven.mmbasemodule.blocks.excludes= ! maven.mmbasemodule.blocks.path=mmbase/components ! ! maven.mmbasemodule.repo=http://mmapps.sourceforge.net/distributions/ Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.xml 27 Sep 2007 16:07:40 -0000 1.4 --- project.xml 21 Mar 2008 10:22:30 -0000 1.5 *************** *** 1,3 **** ! <project> <extend>mmapps-base/mmapps-project.xml</extend> <pomVersion>3</pomVersion> --- 1,4 ---- ! <?xml version="1.0" encoding="ISO-8859-1"?> ! <project> <extend>mmapps-base/mmapps-project.xml</extend> <pomVersion>3</pomVersion> *************** *** 6,10 **** <name>MMBase module plugin</name> <groupId>mmapps</groupId> ! <currentVersion>1.2</currentVersion> <shortDescription>maven plugin to assemble a mmbase module</shortDescription> <inceptionYear>2004</inceptionYear> --- 7,11 ---- <name>MMBase module plugin</name> <groupId>mmapps</groupId> ! <currentVersion>1.3</currentVersion> <shortDescription>maven plugin to assemble a mmbase module</shortDescription> <inceptionYear>2004</inceptionYear> Index: plugin.jelly =================================================================== RCS file: /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin/plugin.jelly,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** plugin.jelly 27 Sep 2007 16:07:40 -0000 1.4 --- plugin.jelly 21 Mar 2008 10:22:29 -0000 1.5 *************** *** 11,15 **** <!-- Default goal : Builds a war file --> <!--==================================================================--> ! <goal name="mmbase-module" prereqs="mmbase-module:mmbase-module" description="delegates to mmbase-module:mmbase-module"/> <!--==================================================================--> --- 11,16 ---- <!-- Default goal : Builds a war file --> <!--==================================================================--> ! <goal name="mmbase-module" prereqs="mmbase-module:mmbase-module" ! description="delegates to mmbase-module:mmbase-module"/> <!--==================================================================--> *************** *** 28,31 **** --- 29,35 ---- <ant:available property="examplesSourcesPresent" type="dir" file="${maven.mmbasemodule.examples}"/> + + <ant:available property="blocksSourcesPresent" type="dir" + file="${maven.mmbasemodule.blocks}"/> <ant:echo message="mmbase module: ${maven.mmbasemodule.final.name}"/> *************** *** 47,53 **** </j:forEach> ! <ant:touch> ! <ant:fileset dir="${maven.mmbasemodule.webapp.dir}"/> ! </ant:touch> <ant:mkdir dir="${maven.mmbasemodule.build.dir}" /> --- 51,57 ---- </j:forEach> ! <ant:touch> ! <ant:fileset dir="${maven.mmbasemodule.webapp.dir}"/> ! </ant:touch> <ant:mkdir dir="${maven.mmbasemodule.build.dir}" /> *************** *** 64,68 **** <j:set var="classPath" value="${maven.mmbasemodule.classpath}"/> <j:if test="${!empty(classPath)}"> ! <ant:attribute name="Class-Path" value="${maven.mmbasemodule.classpath}"/> </j:if> --- 68,72 ---- <j:set var="classPath" value="${maven.mmbasemodule.classpath}"/> <j:if test="${!empty(classPath)}"> ! <ant:attribute name="Class-Path" value="${maven.mmbasemodule.classpath}"/> </j:if> *************** *** 96,119 **** <ant:mkdir dir="${maven.mmbasemodule.webapp.dir}"/> ! <j:set var="webapp.build.webinf" value="${maven.mmbasemodule.webapp.dir}/WEB-INF"/> ! <ant:mkdir dir="${webapp.build.webinf}"/> ! ! <j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/> <ant:mkdir dir="${webapp.build.lib}"/> - - <j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/> - <ant:mkdir dir="${webapp.build.classes}"/> - - <j:set var="webapp.build.tlds" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.tld.dir}"/> - <ant:mkdir dir="${webapp.build.tlds}"/> <j:set var="webapp.build.config" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.config.dir}"/> - <ant:mkdir dir="${webapp.build.config}"/> <j:set var="webapp.build.templates" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.templates.dir}"/> - <ant:mkdir dir="${webapp.build.templates}"/> <j:set var="webapp.build.examples" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.examples.dir}"/> ! <ant:mkdir dir="${webapp.build.examples}"/> <j:if test="${templatesSourcesPresent == 'true'}"> <ant:copy todir="${webapp.build.templates}" preservelastmodified="true"> <ant:fileset dir="${maven.mmbasemodule.templates}" --- 100,113 ---- <ant:mkdir dir="${maven.mmbasemodule.webapp.dir}"/> ! <j:set var="webapp.build.lib" value="${maven.mmbasemodule.webapp.dir}/lib"/> <ant:mkdir dir="${webapp.build.lib}"/> <j:set var="webapp.build.config" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.config.dir}"/> <j:set var="webapp.build.templates" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.templates.dir}"/> <j:set var="webapp.build.examples" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.examples.dir}"/> ! <j:set var="webapp.build.blocks" value="${maven.mmbasemodule.webapp.dir}/${maven.mmbasemodule.blocks.dir}"/> <j:if test="${templatesSourcesPresent == 'true'}"> + <ant:mkdir dir="${webapp.build.templates}"/> <ant:copy todir="${webapp.build.templates}" preservelastmodified="true"> <ant:fileset dir="${maven.mmbasemodule.templates}" *************** *** 125,128 **** --- 119,123 ---- <j:if test="${examplesSourcesPresent == 'true'}"> + <ant:mkdir dir="${webapp.build.examples}"/> <ant:copy todir="${webapp.build.examples}" preservelastmodified="true"> <ant:fileset dir="${maven.mmbasemodule.examples}" *************** *** 133,137 **** --- 128,143 ---- </j:if> + <j:if test="${blocksSourcesPresent == 'true'}"> + <ant:mkdir dir="${webapp.build.blocks}"/> + <ant:copy todir="${webapp.build.blocks}" preservelastmodified="true"> + <ant:fileset dir="${maven.mmbasemodule.blocks}" + includes="${maven.mmbasemodule.blocks.includes}" + excludes="${maven.mmbasemodule.blocks.excludes}"> + </ant:fileset> + </ant:copy> + </j:if> + <j:if test="${configSourcesPresent == 'true'}"> + <ant:mkdir dir="${webapp.build.config}"/> <ant:copy todir="${webapp.build.config}" preservelastmodified="true"> <ant:fileset dir="${maven.mmbasemodule.config}" *************** *** 142,146 **** </j:if> ! <!-- What to do with dependencies? --> <j:forEach var="lib" items="${pom.artifacts}"> --- 148,152 ---- </j:if> ! <!-- What to do with dependencies? --> <j:forEach var="lib" items="${pom.artifacts}"> *************** *** 180,183 **** --- 186,191 ---- <j:set var="build.temp.config" value="${maven.mmbasemodule.build.dir}/temp/config"/> <ant:mkdir dir="${build.temp.config}"/> + <j:set var="build.temp.blocks" value="${maven.mmbasemodule.build.dir}/temp/blocks"/> + <ant:mkdir dir="${build.temp.blocks}"/> <j:set var="build.temp.webapp.dir" value="${maven.mmbasemodule.build.dir}/temp/webapp"/> *************** *** 188,270 **** <j:if test="${dep.type == 'mmbase-module'}"> <j:choose> ! <j:when test="dep.groupId != 'mmbase' and dep.artifactId != 'mmbase'"> ! <j:set var="overwriteSources" value="true"/> ! </j:when> ! <j:otherwise> ! <j:set var="overwriteSources" value="false"/> ! </j:otherwise> </j:choose> ! <j:if test="${dep.getProperty('mmbase.templates.bundle')!='false'}"> ! <j:set var="templatesPath" value="${dep.getProperty('mmbase.templates.path')}"/> ! <ant:unjar src="${lib.path}" dest="${build.temp.templates}"> ! <patternset> ! <include name="${maven.mmbasemodule.templates.dir}/**"/> ! </patternset> ! </ant:unjar> ! <util:available file="${build.temp.templates}/${maven.mmbasemodule.templates.dir}"> ! <ant:move todir="${build.temp.webapp.dir}/${templatesPath}" ! overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}"/> ! </ant:move> ! <ant:delete dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}" /> ! </util:available> ! </j:if> ! ! <j:if test="${dep.getProperty('mmbase.examples.bundle')=='true'}"> ! <j:set var="examplesPath" value="${dep.getProperty('mmbase.examples.path')}"/> ! <ant:unjar src="${lib.path}" dest="${build.temp.examples}"> ! <patternset> ! <include name="${maven.mmbasemodule.examples.dir}/**"/> ! </patternset> ! </ant:unjar> ! <util:available file="${build.temp.examples}/${maven.mmbasemodule.examples.dir}"> ! <ant:move todir="${build.temp.webapp.dir}/${examplesPath}" ! overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.examples}/${maven.mmbasemodule.examples.dir}"/> ! </ant:move> ! <ant:delete dir="${build.temp.examples}/${maven.mmbasemodule.examples.dir}" /> ! </util:available> ! </j:if> - <j:if test="${dep.getProperty('mmbase.config.bundle')!='false'}"> - <ant:unjar src="${lib.path}" dest="${build.temp.config}"> - <patternset> - <include name="${maven.mmbasemodule.config.dir}/**"/> - </patternset> - </ant:unjar> - <!-- merge some config files? --> - <util:available file="${build.temp.config}/${maven.mmbasemodule.config.dir}"> - <ant:move todir="${build.temp.webapp.dir}/WEB-INF/config" - overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> - <ant:fileset dir="${build.temp.config}/${maven.mmbasemodule.config.dir}"/> - </ant:move> - <ant:delete dir="${build.temp.config}/${maven.mmbasemodule.config.dir}" /> - </util:available> - </j:if> <ant:unjar src="${lib.path}" dest="${maven.mmbasemodule.webapp.dir}"> ! <patternset> ! <include name="WEB-INF/lib/**"/> ! </patternset> </ant:unjar> </j:if> </j:forEach> ! <ant:touch> ! <ant:fileset dir="${maven.mmbasemodule.webapp.dir}"/> ! </ant:touch> <util:available file="${build.temp.webapp.dir}"> ! <ant:move todir="${maven.mmbasemodule.webapp.dir}" overwrite="false" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.webapp.dir}"/> ! </ant:move> ! </util:available> ! ! <ant:delete dir="${build.temp.templates}" /> ! <ant:delete dir="${build.temp.examples}" /> ! <ant:delete dir="${build.temp.config}" /> ! <ant:delete dir="${build.temp.webapp.dir}" /> <util:available file="${maven.build.dir}/${maven.final.name}.jar"> --- 196,321 ---- <j:if test="${dep.type == 'mmbase-module'}"> <j:choose> ! <j:when test="${dep.groupId != 'mmbase' and dep.artifactId != 'mmbase'}"> ! <j:set var="overwriteSources" value="true"/> ! </j:when> ! <j:otherwise> ! <j:set var="overwriteSources" value="false"/> ! </j:otherwise> </j:choose> ! <j:if test="${dep.getProperty('mmbase.templates.bundle')!='false'}"> ! <j:set var="templatesPath" value="${dep.getProperty('mmbase.templates.path')}"/> ! <ant:unjar src="${lib.path}" dest="${build.temp.templates}"> ! <patternset> ! <include name="${maven.mmbasemodule.templates.dir}/**"/> ! </patternset> ! </ant:unjar> ! ! <util:available file="${build.temp.templates}/${maven.mmbasemodule.templates.dir}"> ! <ant:move todir="${build.temp.webapp.dir}/${templatesPath}" ! overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}"/> ! </ant:move> ! ! <ant:delete dir="${build.temp.templates}/${maven.mmbasemodule.templates.dir}" /> ! </util:available> ! </j:if> ! ! <j:if test="${dep.getProperty('mmbase.examples.bundle')=='true'}"> ! <j:set var="examplesPath" value="${dep.getProperty('mmbase.examples.path')}"/> ! <ant:unjar src="${lib.path}" dest="${build.temp.examples}"> ! <patternset> ! <include name="${maven.mmbasemodule.examples.dir}/**"/> ! </patternset> ! </ant:unjar> ! ! <util:available file="${build.temp.examples}/${maven.mmbasemodule.examples.dir}"> ! <ant:move todir="${build.temp.webapp.dir}/${examplesPath}" ! overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.examples}/${maven.mmbasemodule.examples.dir}"/> ! </ant:move> ! <ant:delete dir="${build.temp.examples}/${maven.mmbasemodule.examples.dir}" /> ! </util:available> ! </j:if> ! ! <j:if test="${dep.getProperty('mmbase.blocks.bundle')!='false'}"> ! <j:choose> ! <j:when test="${dep.getProperty('mmbase.blocks.path') and dep.getProperty('mmbase.blocks.path') != ''}"> ! <j:set var="blocksPath" value="${dep.getProperty('mmbase.blocks.path')}"/> ! </j:when> ! <j:otherwise> ! <j:choose> ! <j:when test="${dep.artifactId.startsWith('mmbase-')}"> ! <j:set var="blocksPath" value="${maven.mmbasemodule.blocks.path}/${dep.artifactId.substring(7)}"/> ! </j:when> ! <j:otherwise> ! <j:set var="blocksPath" value="${maven.mmbasemodule.blocks.path}/${dep.artifactId}"/> ! </j:otherwise> ! </j:choose> ! </j:otherwise> ! </j:choose> ! ! <ant:unjar src="${lib.path}" dest="${build.temp.blocks}"> ! <patternset> ! <include name="${maven.mmbasemodule.blocks.dir}/**"/> ! </patternset> ! </ant:unjar> ! ! <util:available file="${build.temp.blocks}/${maven.mmbasemodule.blocks.dir}"> ! <ant:move todir="${build.temp.webapp.dir}/${blocksPath}" ! overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.blocks}/${maven.mmbasemodule.blocks.dir}"/> ! </ant:move> ! <ant:delete dir="${build.temp.blocks}/${maven.mmbasemodule.blocks.dir}" /> ! </util:available> ! </j:if> + <j:if test="${dep.getProperty('mmbase.config.bundle')=='true'}"> + <ant:unjar src="${lib.path}" dest="${build.temp.config}"> + <patternset> + <include name="${maven.mmbasemodule.config.dir}/**"/> + </patternset> + </ant:unjar> + + <!-- merge some config files? --> + <util:available file="${build.temp.config}/${maven.mmbasemodule.config.dir}"> + <ant:move todir="${build.temp.webapp.dir}/WEB-INF/config" + overwrite="${overwriteSources}" preservelastmodified="true" includeEmptyDirs="no"> + <ant:fileset dir="${build.temp.config}/${maven.mmbasemodule.config.dir}"/> + </ant:move> + <ant:delete dir="${build.temp.config}/${maven.mmbasemodule.config.dir}" /> + </util:available> + </j:if> + + <ant:unjar src="${lib.path}" dest="${maven.mmbasemodule.webapp.dir}/WEB-INF"> + <patternset> + <include name="lib/**"/> + </patternset> + </ant:unjar> + <!-- lib include of 1.2- plugin version artifacts --> <ant:unjar src="${lib.path}" dest="${maven.mmbasemodule.webapp.dir}"> ! <patternset> ! <include name="WEB-INF/lib/**"/> ! </patternset> </ant:unjar> </j:if> </j:forEach> ! <ant:touch> ! <ant:fileset dir="${maven.mmbasemodule.webapp.dir}"/> ! </ant:touch> <util:available file="${build.temp.webapp.dir}"> ! <ant:move todir="${maven.mmbasemodule.webapp.dir}" overwrite="false" includeEmptyDirs="no"> ! <ant:fileset dir="${build.temp.webapp.dir}"/> ! </ant:move> ! </util:available> ! <ant:delete dir="${build.temp.blocks}" /> ! <ant:delete dir="${build.temp.templates}" /> ! <ant:delete dir="${build.temp.examples}" /> ! <ant:delete dir="${build.temp.config}" /> ! <ant:delete dir="${build.temp.webapp.dir}" /> <util:available file="${maven.build.dir}/${maven.final.name}.jar"> *************** *** 273,334 **** </goal> ! <goal name="mmbase-module:install-builders"> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/lib"> ! <fileScanner var="libScanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/lib" /> ! </fileScanner> ! <j:forEach var="library" items="${libScanner.iterator()}"> ! <ant:unjar src="${library}" dest="${maven.war.webapp.dir}/WEB-INF/classes"> ! <patternset> ! <include name="org/mmbase/config/applications/**/builders/**" /> ! </patternset> ! </ant:unjar> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/applications"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/applications" /> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <j:if test="${dir.path.endsWith('builders')}"> ! <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/builders/applications"> ! <ant:fileset dir="${dir.path}" /> ! </ant:copy> ! </j:if> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config"/> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <fileScanner var="filescan"> ! <fileset dir="${dir.path}" > ! <exclude name="INDEX"/> ! <include name="*"/> ! </fileset> ! </fileScanner> <!-- ## Generate INDEX file with each filename and directory on a new line ## --> <echo file="${dir.path}/INDEX"><j:forEach var="file" items="${filescan.iterator()}">${file.name} </j:forEach><j:forEach var="filedir" items="${filescan.directories()}">${filedir.name}/ </j:forEach></echo> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/config/applications"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/config/applications" /> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <j:if test="${dir.path.endsWith('builders')}"> ! <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/config/builders/applications"> ! <ant:fileset dir="${dir.path}" /> ! </ant:copy> ! </j:if> ! </j:forEach> ! </util:available> ! </goal> <!--==================================================================--> --- 324,385 ---- </goal> ! <goal name="mmbase-module:install-builders"> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/lib"> ! <fileScanner var="libScanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/lib" /> ! </fileScanner> ! <j:forEach var="library" items="${libScanner.iterator()}"> ! <ant:unjar src="${library}" dest="${maven.war.webapp.dir}/WEB-INF/classes"> ! <patternset> ! <include name="org/mmbase/config/applications/**/builders/**" /> ! </patternset> ! </ant:unjar> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/applications"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/applications" /> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <j:if test="${dir.path.endsWith('builders')}"> ! <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config/builders/applications"> ! <ant:fileset dir="${dir.path}" /> ! </ant:copy> ! </j:if> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/classes/org/mmbase/config"/> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <fileScanner var="filescan"> ! <fileset dir="${dir.path}" > ! <exclude name="INDEX"/> ! <include name="*"/> ! </fileset> ! </fileScanner> <!-- ## Generate INDEX file with each filename and directory on a new line ## --> <echo file="${dir.path}/INDEX"><j:forEach var="file" items="${filescan.iterator()}">${file.name} </j:forEach><j:forEach var="filedir" items="${filescan.directories()}">${filedir.name}/ </j:forEach></echo> ! </j:forEach> ! </util:available> ! <util:available file="${maven.war.webapp.dir}/WEB-INF/config/applications"> ! <fileScanner var="scanner"> ! <fileset dir="${maven.war.webapp.dir}/WEB-INF/config/applications" /> ! </fileScanner> ! <j:forEach var="dir" items="${scanner.directories()}"> ! <j:if test="${dir.path.endsWith('builders')}"> ! <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/config/builders/applications"> ! <ant:fileset dir="${dir.path}" /> ! </ant:copy> ! </j:if> ! </j:forEach> ! </util:available> ! </goal> <!--==================================================================--> *************** *** 343,352 **** type="jar" project="${pom}"/> - <artifact:install artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> - </goal> --- 394,401 ---- *************** *** 362,371 **** type="jar" project="${pom}"/> - <artifact:install-snapshot artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> - </goal> --- 411,418 ---- *************** *** 381,390 **** type="jar" project="${pom}"/> - <artifact:deploy artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> - </goal> --- 428,435 ---- *************** *** 397,409 **** <artifact:deploy-snapshot ! artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.jar" type="jar" project="${pom}"/> - <artifact:deploy-snapshot ! artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> - </goal> --- 442,452 ---- <artifact:deploy-snapshot ! artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.jar" type="jar" project="${pom}"/> <artifact:deploy-snapshot ! artifact="${maven.mmbasemodule.build.dir}/${maven.mmbasemodule.final.name}.mmbase-module" type="mmbase-module" project="${pom}"/> </goal> *************** *** 421,427 **** </goal> ! ! <goal name="mmbase-module:report" description="generates the installation documentation"> ! <mkdir dir="${maven.build.dir}/generated-xdocs"/> <copy todir="${maven.build.dir}/generated-xdocs" file="${plugin.resources}/ModuleInstallation.xml"> --- 464,468 ---- </goal> ! <goal name="mmbase-module:report" description="generates the installation documentation"> <mkdir dir="${maven.build.dir}/generated-xdocs"/> <copy todir="${maven.build.dir}/generated-xdocs" file="${plugin.resources}/ModuleInstallation.xml"> *************** *** 434,454 **** </filterset> </copy> ! ! </goal> ! <goal name="maven-mmbase-module-plugin:register" description="site documentation bundle callback registration" > ! <doc:registerReport ! name="mmbase-module installation" ! pluginName="mmbase-module" ! link="ModuleInstallation" ! description="mmbase-module installation instructions"/> ! ! </goal> ! <goal name="maven-mmbase-module-plugin:deregister"> ! <doc:deregisterReport name="mmbase-module installation"/> ! </goal> </project> \ No newline at end of file --- 475,493 ---- </filterset> </copy> ! </goal> ! <goal name="maven-mmbase-module-plugin:register" description="site documentation bundle callback registration" > ! <doc:registerReport ! name="mmbase-module installation" ! pluginName="mmbase-module" ! link="ModuleInstallation" ! description="mmbase-module installation instructions"/> ! </goal> ! <goal name="maven-mmbase-module-plugin:deregister"> ! <doc:deregisterReport name="mmbase-module installation"/> ! </goal> </project> \ No newline at end of file |
|
From: Nico K. <nkl...@us...> - 2008-03-21 10:22:43
|
Update of /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin/plugin-resources In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16156/maven-mmbase-module-plugin/plugin-resources Removed Files: ModuleInstallation.xml Log Message: Add mmbase 1.9 block support --- ModuleInstallation.xml DELETED --- |
|
From: Nico K. <nkl...@us...> - 2008-03-21 10:22:41
|
Update of /cvsroot/mmapps/maven-plugins/maven-mmbase-module-plugin/xdocs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16156/maven-mmbase-module-plugin/xdocs Added Files: ModuleInstallation.xml Log Message: Add mmbase 1.9 block support --- NEW FILE: ModuleInstallation.xml --- <?xml version="1.0" encoding="UTF-8" ?> <document> <properties> <title>install @pom.name@</title> <author email="mm...@kl...">Nico Klasens</author> </properties> <body> <section> <subsection name="install @pom.name@ mmbase-module within web-apps"> <p> There is a <a href="#Automated Bundling With Maven">fully automated</a> mechanism for bundling @pom.name@ within your web-apps. Pre-requisites: <ol> <li>You use <a href="http://maven.apache.org">maven</a> to assemble your web-application.</li> <li>You have installed the <a href="http://mmapps.sourceforge.net/maven-mmbase-module-plugin/">maven-mmbase-module-plugin</a>.</li> </ol> </p> <p> However if you don't use maven you can install @pom.name@ manually. <ul> <li><a href="#Manual Bundling Within Web-Apps">Manual Bundling Within WebApps</a></li> </ul> </p> </subsection> <subsection name="Automated Bundling With Maven"> <p> Ensure your [user_home]/build.properties contains the required maven repository. <source><![CDATA[ maven.repo.remote=http://www.ibiblio.org/maven,@mmbasemodule.repo@ ]]></source> Place the following dependency in your web-app's project.xml <source><![CDATA[ <dependency> <groupId>@pom.groupId@</groupId> <artifactId>@pom.artifactId@</artifactId> <version>@pom.currentVersion@</version> <properties> <war.bundle>true</war.bundle> </properties> <type>mmbase-module</type> </dependency> ]]></source> Place the following postGoal in your web-app's maven.xml <source><![CDATA[ <postGoal name="war:webapp"> <attainGoal name="mmbase-module:obtain-modules"/> </postGoal> ]]></source> The next time you assemble the web-app, maven will automatically install @pom.name@ into your web-app. When new versions of @pom.name@ are released, all you have to do is modify the version of the dependency and re-build. </p> </subsection> <subsection name="Manual Bundling Within Web-Apps"> <p> <ul> <li>download the mmbase-module <a href="@mmbasemodule.repo@/@pom.groupId@/mmbase-modules/@pom.artifactId@-...@po...rrentVersion@.mmbase-module">@pom.artifactId@-...@po...rrentVersion@.mmbase-module</a>.</li> <li>This is a zip file. Unzip it into the root of your web-application.</li> </ul> </p> </subsection> </section> </body> </document> |
|
From: Nico K. <nkl...@us...> - 2008-01-23 20:40:25
|
Update of /cvsroot/mmapps/mmapps-base In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32530/maven-mmbase-module-plugin/mmapps-base Modified Files: mmapps-project.xml Log Message: fixed file for maven 1.1 Index: mmapps-project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps-base/mmapps-project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mmapps-project.xml 16 May 2006 09:01:34 -0000 1.4 --- mmapps-project.xml 23 Jan 2008 20:40:21 -0000 1.5 *************** *** 29,40 **** <mailingList> <name>mmapps cvs list</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/mmapps-cvs</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/mmapps-cvs</unsubscribe> <archive>http://sourceforge.net/mailarchive/forum.php?forum=mmapps-cvs</archive> </mailingList> <mailingList> <name>mmapps users List</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/mmapps-users</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/mmapps-users</unsubscribe> <archive>http://sourceforge.net/mailarchive/forum.php?forum=mmapps-users</archive> </mailingList> --- 29,40 ---- <mailingList> <name>mmapps cvs list</name> ! <subscribe>https://lists.sourceforge.net/lists/listinfo/mmapps-cvs</subscribe> ! <unsubscribe>https://lists.sourceforge.net/lists/listinfo/mmapps-cvs</unsubscribe> <archive>http://sourceforge.net/mailarchive/forum.php?forum=mmapps-cvs</archive> </mailingList> <mailingList> <name>mmapps users List</name> ! <subscribe>https://lists.sourceforge.net/lists/listinfo/mmapps-users</subscribe> ! <unsubscribe>https://lists.sourceforge.net/lists/listinfo/mmapps-users</unsubscribe> <archive>http://sourceforge.net/mailarchive/forum.php?forum=mmapps-users</archive> </mailingList> *************** *** 73,83 **** <sourceDirectory>${basedir}/src</sourceDirectory> <unitTestSourceDirectory>tests</unitTestSourceDirectory> </build> - <unitTest> - <includes> - <include>**/*Tests.java</include> - <include>**/*Suite.java</include> - </includes> - </unitTest> <reports> <report>maven-changelog-plugin</report> --- 73,83 ---- <sourceDirectory>${basedir}/src</sourceDirectory> <unitTestSourceDirectory>tests</unitTestSourceDirectory> + <unitTest> + <includes> + <include>**/*Tests.java</include> + <include>**/*Suite.java</include> + </includes> + </unitTest> </build> <reports> <report>maven-changelog-plugin</report> |
|
From: Nico K. <nkl...@us...> - 2008-01-23 20:12:51
|
Update of /cvsroot/mmapps/mmapps/mmcommons/mmapps-base In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22125/mmcommons/mmapps-base Modified Files: mmapps-project.xml Log Message: Fixed the base maven file for cvs urls Index: mmapps-project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/mmapps-base/mmapps-project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mmapps-project.xml 6 Apr 2006 10:00:33 -0000 1.1 --- mmapps-project.xml 23 Jan 2008 20:12:44 -0000 1.2 *************** *** 66,77 **** </developers> <repository> ! <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/mmapps:${pom.artifactId}</connection> ! <developerConnection>scm:cvs:ssh:use...@cv...:/cvsroot/mmapps:${pom.artifactId}</developerConnection> ! <url>http://cvs.sourceforge.net/viewcvs.py/mmapps/mmapps/${pom.artifactId}/</url> </repository> <build> <sourceDirectory>${basedir}/src</sourceDirectory> <unitTestSourceDirectory>tests</unitTestSourceDirectory> - </build> <unitTest> <includes> --- 66,76 ---- </developers> <repository> ! <connection>scm:cvs:pserver:ano...@mm...:/cvsroot/mmapps:${pom.artifactId}</connection> ! <developerConnection>scm:cvs:ssh:use...@mm...:/cvsroot/mmapps:${pom.artifactId}</developerConnection> ! <url>http://mmapps.cvs.sourceforge.net/mmapps/mmapps/${pom.artifactId}/</url> </repository> <build> <sourceDirectory>${basedir}/src</sourceDirectory> <unitTestSourceDirectory>tests</unitTestSourceDirectory> <unitTest> <includes> *************** *** 80,83 **** --- 79,83 ---- </includes> </unitTest> + </build> <reports> <report>maven-changelog-plugin</report> |
|
From: Nico K. <nkl...@us...> - 2008-01-14 22:26:08
|
Update of /cvsroot/mmapps/mmapps/mmcommons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22699/mmcommons Modified Files: project.xml Log Message: 1.4.3-SNAPSHOT Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/project.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** project.xml 14 Jan 2008 22:24:44 -0000 1.14 --- project.xml 14 Jan 2008 22:26:00 -0000 1.15 *************** *** 6,10 **** <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.2</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> --- 6,10 ---- <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.3-SNAPSHOT</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> |
|
From: Nico K. <nkl...@us...> - 2008-01-14 22:24:49
|
Update of /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/beans In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22214/mmcommons/src/java/net/sf/mmapps/commons/beans Modified Files: NodetypeBean.java NodeBean.java MMBaseNodeMapper.java Log Message: Add type string to NodeBean Index: NodetypeBean.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/beans/NodetypeBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NodetypeBean.java 6 Apr 2006 10:00:33 -0000 1.1 --- NodetypeBean.java 14 Jan 2008 22:24:43 -0000 1.2 *************** *** 17,21 **** */ public class NodetypeBean extends NodeBean { ! public String name; public String getName() { --- 17,24 ---- */ public class NodetypeBean extends NodeBean { ! ! private static final long serialVersionUID = -4892877864883371932L; ! ! public String name; public String getName() { Index: NodeBean.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/beans/NodeBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NodeBean.java 20 Sep 2007 18:24:27 -0000 1.2 --- NodeBean.java 14 Jan 2008 22:24:43 -0000 1.3 *************** *** 8,14 **** */ public class NodeBean implements Serializable { - private int id; // mmbase number ! private String type; // mmbase otype private String owner; --- 8,17 ---- */ public class NodeBean implements Serializable { ! private static final long serialVersionUID = -8280773380954246333L; ! ! private int id; // mmbase number ! ! private String nodeType; // mmbase otype private String owner; *************** *** 22,31 **** } ! public String getType() { ! return type; } ! public void setType(String type) { ! this.type = type; } --- 25,34 ---- } ! public String getNodeType() { ! return nodeType; } ! public void setNodeType(String type) { ! this.nodeType = type; } Index: MMBaseNodeMapper.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/beans/MMBaseNodeMapper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MMBaseNodeMapper.java 20 Sep 2007 18:24:27 -0000 1.4 --- MMBaseNodeMapper.java 14 Jan 2008 22:24:43 -0000 1.5 *************** *** 46,51 **** fname = "id"; } else if (fname.equalsIgnoreCase("otype")) { ! // fname = "type"; ! // v = getOType(v); } --- 46,51 ---- fname = "id"; } else if (fname.equalsIgnoreCase("otype")) { ! fname = "nodeType"; ! v = getOType(v); } *************** *** 80,84 **** } ! /** * Maps fields from a MMBase node to a Java Class * --- 80,91 ---- } ! private static Object getOType(Object v) { ! if (v instanceof NodeManager) { ! return ((NodeManager) v).getName(); ! } ! return null; ! } ! ! /** * Maps fields from a MMBase node to a Java Class * |
|
From: Nico K. <nkl...@us...> - 2008-01-14 22:24:49
|
Update of /cvsroot/mmapps/mmapps/mmcommons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22214/mmcommons Modified Files: project.xml Log Message: Add type string to NodeBean Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/project.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** project.xml 4 Jan 2008 20:57:13 -0000 1.13 --- project.xml 14 Jan 2008 22:24:44 -0000 1.14 *************** *** 6,10 **** <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.2-SNAPSHOT</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> --- 6,10 ---- <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.2</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> |
|
From: Nico K. <nkl...@us...> - 2008-01-04 20:57:19
|
Update of /cvsroot/mmapps/mmapps/mmcommons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28721/mmcommons Modified Files: project.xml Log Message: 1.4.2-SNAPSHOT Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** project.xml 4 Jan 2008 20:56:36 -0000 1.12 --- project.xml 4 Jan 2008 20:57:13 -0000 1.13 *************** *** 6,10 **** <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.1</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> --- 6,10 ---- <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.2-SNAPSHOT</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> |
|
From: Nico K. <nkl...@us...> - 2008-01-04 20:56:40
|
Update of /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/util In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28272/mmcommons/src/java/net/sf/mmapps/commons/util Modified Files: XmlUtil.java Log Message: Handle utf-8 characters without depending on -Dfile.encoding Index: XmlUtil.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/util/XmlUtil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XmlUtil.java 20 Sep 2007 18:24:27 -0000 1.6 --- XmlUtil.java 4 Jan 2008 20:56:36 -0000 1.7 *************** *** 2,9 **** import java.io.ByteArrayInputStream; ! import java.io.ByteArrayOutputStream; ! import java.io.IOException; import java.io.InputStream; - import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.util.*; --- 2,7 ---- import java.io.ByteArrayInputStream; ! import java.io.CharArrayWriter; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.util.*; *************** *** 82,105 **** */ private static String serializeDocument(Document doc, Properties format) { ! OutputStream bos = null; try { ! bos = new ByteArrayOutputStream(); TransformerFactory tfactory = TransformerFactory.newInstance(); Transformer serializer = tfactory.newTransformer(); serializer.setOutputProperties(format); ! serializer.transform(new DOMSource(doc), new StreamResult(bos)); ! return bos.toString(); } catch( Exception e ) { logger.error(e.getMessage()); logger.debug(e); } finally { ! try { ! if( bos != null ) bos.close(); ! } ! catch( IOException e ) { ! logger.error( "[serializeDocument()] Could not close OutputStream!" ); ! } } return ""; --- 80,99 ---- */ private static String serializeDocument(Document doc, Properties format) { ! CharArrayWriter caw = null; try { ! caw = new CharArrayWriter(); TransformerFactory tfactory = TransformerFactory.newInstance(); Transformer serializer = tfactory.newTransformer(); serializer.setOutputProperties(format); ! serializer.transform(new DOMSource(doc), new StreamResult(caw)); ! caw.flush(); ! return caw.toString(); } catch( Exception e ) { logger.error(e.getMessage()); logger.debug(e); } finally { ! if( caw != null ) caw.close(); } return ""; *************** *** 114,120 **** */ public static String serializeDocumentFragment(DocumentFragment docfrag) { ! OutputStream bos = null; try { ! bos = new ByteArrayOutputStream(); Properties format = getXmlOutput(false, false, true, true); --- 108,114 ---- */ public static String serializeDocumentFragment(DocumentFragment docfrag) { ! CharArrayWriter caw =null; try { ! caw = new CharArrayWriter(); Properties format = getXmlOutput(false, false, true, true); *************** *** 122,138 **** Transformer serializer = tfactory.newTransformer(); serializer.setOutputProperties(format); ! serializer.transform(new DOMSource(docfrag), new StreamResult(bos)); ! return bos.toString(); } catch( Exception e ) { logger.error( e.getMessage() ); logger.debug(e); } finally { ! try { ! if( bos != null ) bos.close(); ! } ! catch( IOException e ) { ! logger.error( "[serializeDocument()] Could not close OutputStream!" ); ! } } return ""; --- 116,128 ---- Transformer serializer = tfactory.newTransformer(); serializer.setOutputProperties(format); ! serializer.transform(new DOMSource(docfrag), new StreamResult(caw)); ! caw.flush(); ! return caw.toString(); } catch( Exception e ) { logger.error( e.getMessage() ); logger.debug(e); } finally { ! if( caw != null ) caw.close(); } return ""; *************** *** 159,165 **** */ public static String serializeElement(Element element, boolean omitxml) { ! OutputStream bos = null; try { ! bos = new ByteArrayOutputStream(); Properties format = getXmlOutput(false, false, omitxml, omitxml); --- 149,155 ---- */ public static String serializeElement(Element element, boolean omitxml) { ! CharArrayWriter caw = null; try { ! caw = new CharArrayWriter(); Properties format = getXmlOutput(false, false, omitxml, omitxml); *************** *** 167,183 **** Transformer serializer = tfactory.newTransformer(); serializer.setOutputProperties(format); ! serializer.transform(new DOMSource(element), new StreamResult(bos)); ! return bos.toString(); } catch( Exception e ) { logger.error(e.getMessage()); logger.debug(e); } finally { ! try { ! if( bos != null ) bos.close(); ! } ! catch( IOException e ) { ! logger.error( "[serializeDocument()] Could not close OutputStream!" ); ! } } return ""; --- 157,169 ---- Transformer serializer = tfactory.newTransformer(); serializer.setOutputProperties(format); ! serializer.transform(new DOMSource(element), new StreamResult(caw)); ! caw.flush(); ! return caw.toString(); } catch( Exception e ) { logger.error(e.getMessage()); logger.debug(e); } finally { ! if( caw != null ) caw.close(); } return ""; |
|
From: Nico K. <nkl...@us...> - 2008-01-04 20:56:40
|
Update of /cvsroot/mmapps/mmapps/mmcommons In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28272/mmcommons Modified Files: project.xml Log Message: Handle utf-8 characters without depending on -Dfile.encoding Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/mmcommons/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** project.xml 20 Sep 2007 18:25:25 -0000 1.11 --- project.xml 4 Jan 2008 20:56:36 -0000 1.12 *************** *** 6,10 **** <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> --- 6,10 ---- <artifactId>mmcommons</artifactId> <name>MMBase Commons</name> ! <currentVersion>1.4.1</currentVersion> <package>net.sf.mmapps.commons</package> <shortDescription>MMCommons - Java components for MMbase apps</shortDescription> |
|
From: Nico K. <nkl...@us...> - 2007-12-22 18:14:47
|
Update of /cvsroot/mmapps/mmapps/remotepublishing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32465/remotepublishing Modified Files: project.xml Log Message: 1.0.15-SNAPSHOT Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/remotepublishing/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** project.xml 22 Dec 2007 17:55:00 -0000 1.11 --- project.xml 22 Dec 2007 18:14:39 -0000 1.12 *************** *** 5,9 **** <artifactId>remotepublishing</artifactId> <name>MMBase Remote Publishing</name> ! <currentVersion>1.0.14</currentVersion> <package>org.mmbase.remotepublishing</package> <shortDescription>The MMBase Remote Publishing module provides a way to clone nodes from one cloud to the other</shortDescription> --- 5,9 ---- <artifactId>remotepublishing</artifactId> <name>MMBase Remote Publishing</name> ! <currentVersion>1.0.15-SNAPSHOT</currentVersion> <package>org.mmbase.remotepublishing</package> <shortDescription>The MMBase Remote Publishing module provides a way to clone nodes from one cloud to the other</shortDescription> |
|
From: Nico K. <nkl...@us...> - 2007-12-22 17:55:12
|
Update of /cvsroot/mmapps/mmapps/remotepublishing/src/org/mmbase/remotepublishing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22094/remotepublishing/src/org/mmbase/remotepublishing Modified Files: PublishManager.java Log Message: Improved performance of synchronization of binary fields based on optional checksum field Index: PublishManager.java =================================================================== RCS file: /cvsroot/mmapps/mmapps/remotepublishing/src/org/mmbase/remotepublishing/PublishManager.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PublishManager.java 20 Sep 2007 18:24:45 -0000 1.8 --- PublishManager.java 22 Dec 2007 17:55:00 -0000 1.9 *************** *** 262,267 **** else { if (sourceNode.getNodeManager().getField(fieldName).getState() != Field.STATE_SYSTEM) { ! destinationNode.setValueWithoutProcess(fieldName, ! sourceNode.getValueWithoutProcess(fieldName)); } } --- 262,267 ---- else { if (sourceNode.getNodeManager().getField(fieldName).getState() != Field.STATE_SYSTEM) { ! destinationNode.setValueWithoutProcess(fieldName, ! sourceNode.getValueWithoutProcess(fieldName)); } } *************** *** 528,532 **** * * @param localNode this localNode must come from local cloud. ! * @return */ public static boolean isImported(Node localNode) { --- 528,532 ---- * * @param localNode this localNode must come from local cloud. ! * @return is node imported */ public static boolean isImported(Node localNode) { *************** *** 1015,1055 **** } ! Map<Integer,Node> publishedNodesMap = getPublishedNodes(publishInfoNodes); ! Iterator<Integer> cloudNumberIterator = publishedNodesMap.keySet().iterator(); ! ! while(cloudNumberIterator.hasNext()) { ! int remoteCloudNumber = cloudNumberIterator.next(); ! CloudInfo remoteCloudInfo = CloudInfo.getCloudInfo(remoteCloudNumber); ! Node remoteNode = publishedNodesMap.get(remoteCloudNumber); ! ! if (updateNode && updatedAfterTimestamp.contains(localNode.getNumber())) { ! syncNode(localCloudInfo, localNode, remoteCloudInfo, remoteNode); ! } ! if (updateRelations) { ! if (relatedNodes != null && relatedNodes.size() > 0) { ! syncRelations(localCloudInfo, localNode, remoteCloudInfo, remoteNode, relatedNodes); } ! else { ! syncRelations(localCloudInfo, localNode, remoteCloudInfo, remoteNode); } } ! } } } private static Date getLastModifiedDate(Node localNode) { for (Iterator<Field> iterator = localNode.getNodeManager().getFields().iterator(); iterator.hasNext();) { Field field = iterator.next(); ! if (field.getType() == Field.TYPE_DATETIME) { DataType dtype = field.getDataType(); ! while (dtype != null && !"lastmodified".equals(dtype.getName())) { dtype = dtype.getOrigin(); } if (dtype != null) { ! return localNode.getDateValue(field.getName()); } } } ! return new Date(); } --- 1015,1068 ---- } ! // simple check to prevent remote calls while nothing has to be done ! if (updateRelations || !updatedAfterTimestamp.isEmpty()) { ! Map<Integer,Node> publishedNodesMap = getPublishedNodes(publishInfoNodes); ! Iterator<Integer> cloudNumberIterator = publishedNodesMap.keySet().iterator(); ! ! while(cloudNumberIterator.hasNext()) { ! int remoteCloudNumber = cloudNumberIterator.next(); ! CloudInfo remoteCloudInfo = CloudInfo.getCloudInfo(remoteCloudNumber); ! Node remoteNode = publishedNodesMap.get(remoteCloudNumber); ! ! if (updateNode && updatedAfterTimestamp.contains(localNode.getNumber())) { ! syncNode(localCloudInfo, localNode, remoteCloudInfo, remoteNode); } ! if (updateRelations) { ! if (relatedNodes != null && relatedNodes.size() > 0) { ! syncRelations(localCloudInfo, localNode, remoteCloudInfo, remoteNode, relatedNodes); ! } ! else { ! syncRelations(localCloudInfo, localNode, remoteCloudInfo, remoteNode); ! } } } ! } } } private static Date getLastModifiedDate(Node localNode) { + String fieldname = getFieldNameWithDatatype(localNode, Field.TYPE_DATETIME, "lastmodified"); + if (fieldname != null) { + return localNode.getDateValue(fieldname); + } + return new Date(); + } + + private static String getFieldNameWithDatatype(Node localNode, int fieldType, + String datatypeName) { + String fieldname = null; for (Iterator<Field> iterator = localNode.getNodeManager().getFields().iterator(); iterator.hasNext();) { Field field = iterator.next(); ! if (field.getType() == fieldType) { DataType dtype = field.getDataType(); ! while (dtype != null && !datatypeName.equals(dtype.getName())) { dtype = dtype.getOrigin(); } if (dtype != null) { ! fieldname = field.getName(); } } } ! return fieldname; } *************** *** 1066,1069 **** --- 1079,1083 ---- if (remoteNode != null) { syncFields(localCloudInfo, localNode, remoteCloudInfo, remoteNode); + boolean aliasChanged = syncAliasses(localNode, remoteNode); if (aliasChanged || remoteNode.isChanged()) { *************** *** 1101,1109 **** fieldName.equals("dnumber") || fieldName.equals("rnumber"))) { ! cloneNodeField(localCloudInfo, localNode, remoteCloudInfo, remoteNode, field); } } } private static boolean syncAliasses(Node localNode, Node remoteNode) { StringList list = localNode.getAliases(); --- 1115,1154 ---- fieldName.equals("dnumber") || fieldName.equals("rnumber"))) { ! ! int fieldType = field.getType(); ! if (fieldType == Field.TYPE_BINARY) { ! syncBinaryField(localNode, remoteNode, fieldName); ! } ! else { ! cloneNodeField(localCloudInfo, localNode, remoteCloudInfo, remoteNode, field); ! } } } } + private static void syncBinaryField(Node sourceNode, Node destinationNode, String fieldName) { + boolean syncField = true; + String checksumField = getFieldNameWithDatatype(sourceNode, Field.TYPE_STRING, "checksum"); + if (checksumField != null) { + String localChecksum = sourceNode.getStringValue(checksumField); + try { + String remoteChecksum = destinationNode.getStringValue(checksumField); + if ((localChecksum == null && remoteChecksum == null) + || (localChecksum != null && localChecksum.equals(remoteChecksum))) { + syncField = false; + } + } + catch (Throwable t) { + // The remote side could throw an exception when the field does not exist. + log.debug("Errror while remote checksum check. Node " + destinationNode.getNumber() + " field " + fieldName, t); + } + } + if (syncField) { + destinationNode.setValueWithoutProcess(fieldName, sourceNode + .getValueWithoutProcess(fieldName)); + } + } + + private static boolean syncAliasses(Node localNode, Node remoteNode) { StringList list = localNode.getAliases(); |
|
From: Nico K. <nkl...@us...> - 2007-12-22 17:55:12
|
Update of /cvsroot/mmapps/mmapps/remotepublishing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22094/remotepublishing Modified Files: project.xml Log Message: Improved performance of synchronization of binary fields based on optional checksum field Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/remotepublishing/project.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** project.xml 5 Nov 2007 21:14:55 -0000 1.10 --- project.xml 22 Dec 2007 17:55:00 -0000 1.11 *************** *** 5,9 **** <artifactId>remotepublishing</artifactId> <name>MMBase Remote Publishing</name> ! <currentVersion>1.0.14-SNAPSHOT</currentVersion> <package>org.mmbase.remotepublishing</package> <shortDescription>The MMBase Remote Publishing module provides a way to clone nodes from one cloud to the other</shortDescription> --- 5,9 ---- <artifactId>remotepublishing</artifactId> <name>MMBase Remote Publishing</name> ! <currentVersion>1.0.14</currentVersion> <package>org.mmbase.remotepublishing</package> <shortDescription>The MMBase Remote Publishing module provides a way to clone nodes from one cloud to the other</shortDescription> |
|
From: Nico K. <nkl...@us...> - 2007-11-05 21:14:59
|
Update of /cvsroot/mmapps/mmapps/remotepublishing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27158/remotepublishing Modified Files: project.xml Log Message: 1.0.14 snapshot Index: project.xml =================================================================== RCS file: /cvsroot/mmapps/mmapps/remotepublishing/project.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** project.xml 5 Nov 2007 20:50:36 -0000 1.9 --- project.xml 5 Nov 2007 21:14:55 -0000 1.10 *************** *** 5,9 **** <artifactId>remotepublishing</artifactId> <name>MMBase Remote Publishing</name> ! <currentVersion>1.0.13</currentVersion> <package>org.mmbase.remotepublishing</package> <shortDescription>The MMBase Remote Publishing module provides a way to clone nodes from one cloud to the other</shortDescription> --- 5,9 ---- <artifactId>remotepublishing</artifactId> <name>MMBase Remote Publishing</name> ! <currentVersion>1.0.14-SNAPSHOT</currentVersion> <package>org.mmbase.remotepublishing</package> <shortDescription>The MMBase Remote Publishing module provides a way to clone nodes from one cloud to the other</shortDescription> |
