[exo-jcr-commits] exo-jcr SVN: r2374 - in kernel/trunk/exo.kernel.container/src/main: resources and 1 other directory.

Author: nfilotto Date: 2010-05-12 13:07:26 -0400 (Wed, 12 May 2010) New Revision: 2374 Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Component.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ComponentLifecyclePlugin.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ComponentPlugin.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ContainerLifecyclePlugin.java kernel/trunk/exo.kernel.container/src/main/resources/binding.xml Log: EXOJCR-719: Now the method Configuration.toXML() add the source URL of the components and the plugins as comment to the XML content Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Component.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Component.java 2010-05-12 16:29:51 UTC (rev 2373) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/Component.java 2010-05-12 17:07:26 UTC (rev 2374) @@ -19,6 +19,7 @@ package org.exoplatform.container.xml; import org.exoplatform.container.configuration.ConfigurationManagerImpl; +import org.jibx.runtime.IMarshallingContext; import java.net.URL; import java.util.ArrayList; @@ -170,4 +171,8 @@ multiInstance = b; } + public void preGet(IMarshallingContext ictx) + { + ConfigurationMarshallerUtil.addURLToContent(documentURL, ictx); + } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ComponentLifecyclePlugin.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ComponentLifecyclePlugin.java 2010-05-12 16:29:51 UTC (rev 2373) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ComponentLifecyclePlugin.java 2010-05-12 17:07:26 UTC (rev 2374) @@ -18,18 +18,31 @@ */ package org.exoplatform.container.xml; +import org.exoplatform.container.configuration.ConfigurationManagerImpl; +import org.jibx.runtime.IMarshallingContext; + +import java.net.URL; + /** * Created by The eXo Platform SAS Author : Tuan Nguyen * tuan08(a)users.sourceforge.net Sep 8, 2005 */ public class ComponentLifecyclePlugin { + + final URL documentURL; + private String type; private ManageableComponents manageableComponents; private InitParams initParams; + public ComponentLifecyclePlugin() + { + documentURL = ConfigurationManagerImpl.getCurrentURL(); + } + public String getType() { return type; @@ -60,4 +73,8 @@ this.initParams = initParams; } + public void preGet(IMarshallingContext ictx) + { + ConfigurationMarshallerUtil.addURLToContent(documentURL, ictx); + } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ComponentPlugin.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ComponentPlugin.java 2010-05-12 16:29:51 UTC (rev 2373) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ComponentPlugin.java 2010-05-12 17:07:26 UTC (rev 2374) @@ -18,6 +18,11 @@ */ package org.exoplatform.container.xml; +import org.exoplatform.container.configuration.ConfigurationManagerImpl; +import org.jibx.runtime.IMarshallingContext; + +import java.net.URL; + /** * @author Tuan Nguyen (tuan08(a)users.sourceforge.net) * @since Apr 18, 2005 @@ -25,6 +30,9 @@ */ public class ComponentPlugin implements Comparable<ComponentPlugin> { + + final URL documentURL; + String name; String type; @@ -37,6 +45,11 @@ int priority; + public ComponentPlugin() + { + documentURL = ConfigurationManagerImpl.getCurrentURL(); + } + public String getName() { return name; @@ -104,4 +117,9 @@ { return getPriority() - o.getPriority(); } + + public void preGet(IMarshallingContext ictx) + { + ConfigurationMarshallerUtil.addURLToContent(documentURL, ictx); + } } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ContainerLifecyclePlugin.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ContainerLifecyclePlugin.java 2010-05-12 16:29:51 UTC (rev 2373) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/xml/ContainerLifecyclePlugin.java 2010-05-12 17:07:26 UTC (rev 2374) @@ -18,12 +18,20 @@ */ package org.exoplatform.container.xml; +import org.exoplatform.container.configuration.ConfigurationManagerImpl; +import org.jibx.runtime.IMarshallingContext; + +import java.net.URL; + /** * Created by The eXo Platform SAS Author : Tuan Nguyen * tuan08(a)users.sourceforge.net Sep 8, 2005 */ public class ContainerLifecyclePlugin implements Comparable<ContainerLifecyclePlugin> { + + final URL documentURL; + private String name; private String type; @@ -34,6 +42,11 @@ private InitParams initParams; + public ContainerLifecyclePlugin() + { + documentURL = ConfigurationManagerImpl.getCurrentURL(); + } + public String getName() { return name; @@ -88,4 +101,9 @@ { return getPriority() - o.getPriority(); } + + public void preGet(IMarshallingContext ictx) + { + ConfigurationMarshallerUtil.addURLToContent(documentURL, ictx); + } } Modified: kernel/trunk/exo.kernel.container/src/main/resources/binding.xml =================================================================== --- kernel/trunk/exo.kernel.container/src/main/resources/binding.xml 2010-05-12 16:29:51 UTC (rev 2373) +++ kernel/trunk/exo.kernel.container/src/main/resources/binding.xml 2010-05-12 17:07:26 UTC (rev 2374) @@ -137,7 +137,7 @@ add-method="addParam" iter-method="getObjectParamIterator"/> </mapping> - <mapping name="component-plugin" class="org.exoplatform.container.xml.ComponentPlugin"> + <mapping name="component-plugin" class="org.exoplatform.container.xml.ComponentPlugin" pre-get="preGet"> <value name="name" field="name" /> <value name="set-method" field="setMethod" /> <value name="type" field="type" /> @@ -152,7 +152,7 @@ <collection item-type="org.exoplatform.container.xml.ComponentPlugin" field="componentPlugins"/> </mapping> - <mapping name="container-lifecycle-plugin" class="org.exoplatform.container.xml.ContainerLifecyclePlugin"> + <mapping name="container-lifecycle-plugin" class="org.exoplatform.container.xml.ContainerLifecyclePlugin" pre-get="preGet"> <value name="name" field="name" usage="optional" /> <value name="type" field="type" /> <value name="description" field="description" usage="optional" /> @@ -168,7 +168,7 @@ </collection> </mapping> - <mapping name="component-lifecycle-plugin" class="org.exoplatform.container.xml.ComponentLifecyclePlugin"> + <mapping name="component-lifecycle-plugin" class="org.exoplatform.container.xml.ComponentLifecyclePlugin" pre-get="preGet"> <value name="type" field="type" /> <structure map-as="org.exoplatform.container.xml.ManageableComponents" get-method="getManageableComponents" set-method="setManageableComponents"/> @@ -176,7 +176,7 @@ get-method="getInitParams" set-method="setInitParams"/> </mapping> - <mapping name="component" class="org.exoplatform.container.xml.Component"> + <mapping name="component" class="org.exoplatform.container.xml.Component" pre-get="preGet"> <value name="key" field="key" usage="optional" /> <value name="jmx-name" field="jmxName" usage="optional" /> <value name="type" field="type" />