Menu
▾
▴
[Aplaws-commit] r2447 - in contrib/camden/ccm-lbc-eforms: . sql src src/com/arsdigita/camden/cms/contenttypes src/com/arsdigita/camden/cms/contenttypes/ui
|
From: <pb...@fe...> - 2012-12-30 09:48:06
|
Author: pboy Date: 2012-12-30 09:47:56 +0000 (Sun, 30 Dec 2012) New Revision: 2447 Added: contrib/camden/ccm-lbc-eforms/sql/ccm-lbc-eforms/ contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.config contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.load contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.upgrade Removed: contrib/camden/ccm-lbc-eforms/sql/ccm-ldn-camden-eforms/ contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.config contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.load contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.upgrade Modified: contrib/camden/ccm-lbc-eforms/application.xml contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EForm.java contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EFormInitializer.java contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EFormLoader.java contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertiesStep.java contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertyForm.java Log: First part of update to version 2.0. Not tested yet. Modified: contrib/camden/ccm-lbc-eforms/application.xml =================================================================== --- contrib/camden/ccm-lbc-eforms/application.xml 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/application.xml 2012-12-30 09:47:56 UTC (rev 2447) @@ -1,8 +1,8 @@ <?xml version="1.0"?> <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" - name="ccm-ldn-camden-eforms" + name="ccm-lbc-eforms" prettyName="Camden eForms Content Type" - version="1.0.1" + version="6.6.0" release="1" webapp="ROOT"> <ccm:dependencies> Copied: contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.config (from rev 2439, contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.config) =================================================================== --- contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.config (rev 0) +++ contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.config 2012-12-30 09:47:56 UTC (rev 2447) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<registry> + <!-- nothing yet --> +</registry> Copied: contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.load (from rev 2439, contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.load) =================================================================== --- contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.load (rev 0) +++ contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.load 2012-12-30 09:47:56 UTC (rev 2447) @@ -0,0 +1,16 @@ +<load> + <requires> + <table name="inits"/> + <table name="acs_objects"/> + <table name="cms_items"/> + <initializer class="com.arsdigita.cms.Initializer"/> + </requires> + <provides> + <table name="ct_eform"/> + <initializer class="com.arsdigita.camden.cms.contenttypes.EFormInitializer"/> + </provides> + <scripts> + <schema directory="ccm-lbc-eforms"/> + <data class="com.arsdigita.camden.cms.contenttypes.EFormLoader"/> + </scripts> +</load> Copied: contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.upgrade (from rev 2439, contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.upgrade) =================================================================== --- contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.upgrade (rev 0) +++ contrib/camden/ccm-lbc-eforms/src/ccm-lbc-eforms.upgrade 2012-12-30 09:47:56 UTC (rev 2447) @@ -0,0 +1,5 @@ +<upgrade> + <version from="1.0.0" to="1.0.1"> + <script sql="ccm-lbc-eforms/upgrade/::database::-1.0.0-1.0.1.sql"/> + </version> +</upgrade> Deleted: contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.config =================================================================== --- contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.config 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.config 2012-12-30 09:47:56 UTC (rev 2447) @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<registry> - <!-- nothing yet --> -</registry> Deleted: contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.load =================================================================== --- contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.load 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.load 2012-12-30 09:47:56 UTC (rev 2447) @@ -1,16 +0,0 @@ -<load> - <requires> - <table name="inits"/> - <table name="acs_objects"/> - <table name="cms_items"/> - <initializer class="com.arsdigita.cms.Initializer"/> - </requires> - <provides> - <table name="ct_eform"/> - <initializer class="com.arsdigita.camden.cms.contenttypes.EFormInitializer"/> - </provides> - <scripts> - <schema directory="ccm-ldn-camden-eforms"/> - <data class="com.arsdigita.camden.cms.contenttypes.EFormLoader"/> - </scripts> -</load> Deleted: contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.upgrade =================================================================== --- contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.upgrade 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/src/ccm-ldn-camden-eforms.upgrade 2012-12-30 09:47:56 UTC (rev 2447) @@ -1,5 +0,0 @@ -<upgrade> - <version from="1.0.0" to="1.0.1"> - <script sql="ccm-ldn-camden-eforms/upgrade/::database::-1.0.0-1.0.1.sql"/> - </version> -</upgrade> Modified: contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EForm.java =================================================================== --- contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EForm.java 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EForm.java 2012-12-30 09:47:56 UTC (rev 2447) @@ -31,10 +31,11 @@ /** * This content type represents an e-Form. * + * @version $Id$ */ public class EForm extends ContentPage { - public final static String versionId = "$Id$"; + /** Private Logger instance for debugging purpose. */ private static final Logger s_log = Logger.getLogger(EForm.class); /** PDL property name for definition */ @@ -48,6 +49,10 @@ public static final String TYPE = BASE_DATA_OBJECT_TYPE; + /** + * Default Constructor. + * TODO: Add cocumentation! + */ public EForm() { this( BASE_DATA_OBJECT_TYPE ); try { @@ -80,18 +85,36 @@ } + /** + * TODO: Add documentation! + * @return + */ public String getURL() { return (String) get(URL); } + /** + * TODO: Add documentation! + * @return + */ public void setURL( String url ) { set(URL, url); } + /** + * TODO: Add documentation! + * @return + */ + @Override public String getDescription() { return (String) get(DESCRIPTION); } + /** + * TODO: Add documentation! + * @return + */ + @Override public void setDescription( String description ) { set(DESCRIPTION, description); } Modified: contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EFormInitializer.java =================================================================== --- contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EFormInitializer.java 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EFormInitializer.java 2012-12-30 09:47:56 UTC (rev 2447) @@ -22,20 +22,27 @@ import org.apache.log4j.Logger; /** - * The eForm content type initializer. + * Runtime initialization for the eForm content type, executes at each + * system startup. + * + * Just uses the super class methods. + * + * This is done by runtimeRuntime startup method which runs the init() methods + * of all initializers (this one just using the parent implementation). * * @author Alan Pevec + * @version $Id$ */ public class EFormInitializer extends ContentTypeInitializer { - public final static String versionId = - "$Id$" + - "$Author$" + - "$DateTime$"; + /** Private Logger instance for debugging purpose. */ private static final Logger s_log = Logger.getLogger(EFormInitializer.class); + /** + * Constructor, just sets the PDL manifest file and object type string. + */ public EFormInitializer() { - super("ccm-ldn-camden-eforms.pdl.mf", + super("ccm-lbc-eforms.pdl.mf", EForm.BASE_DATA_OBJECT_TYPE); } Modified: contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EFormLoader.java =================================================================== --- contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EFormLoader.java 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/EFormLoader.java 2012-12-30 09:47:56 UTC (rev 2447) @@ -18,33 +18,50 @@ */ package com.arsdigita.camden.cms.contenttypes; +import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.ContentType; import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; -import com.arsdigita.cms.ContentType; -import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.lifecycle.LifecycleDefinition; -import com.arsdigita.workflow.simple.WorkflowTemplate; import com.arsdigita.util.UncheckedWrapperException; -import java.net.URL; -import java.net.MalformedURLException; import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ResourceParameter; import com.arsdigita.util.parameter.URLParameter; +import com.arsdigita.workflow.simple.WorkflowTemplate; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; /** - * e-Form content type loader + * Loads the database after the e-Form content type data model has been + * created. * + * Executes nonrecurring at install time and loads (installs and initializes) + * the ccm-lbc-eforms package persistently into database. + * * @author Alan Pevec + * @version $Id$ */ public class EFormLoader extends AbstractContentTypeLoader { - public final static String versionId = "$Id$"; private static final String[] TYPES = { "/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/EForm.xml" }; - private URLParameter m_template; + // URL resource parameter removed! + // private URLParameter m_template; + /** Create parameter for... */ + private final Parameter m_template = new ResourceParameter( + "com.arsdigita.camden.cms.contenttypes.eform.defaulttemplate", + Parameter.REQUIRED, + "/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/eform-item.jsp" + ); + /** + * Constructor + */ public EFormLoader() { +/* URL resource protocol removed. See cms.CMSConfig for details. try { m_template = new URLParameter ("com.arsdigita.camden.cms.contenttypes.eform.defaulttemplate", @@ -55,6 +72,7 @@ } catch (MalformedURLException ex) { throw new UncheckedWrapperException("cannot parse url", ex); } +*/ register(m_template); } @@ -63,15 +81,24 @@ return TYPES; } + /** + * + * @param section + * @param type + * @param ld + * @param wf + */ + @Override protected void prepareSection(final ContentSection section, - final ContentType type, - final LifecycleDefinition ld, - final WorkflowTemplate wf) { + final ContentType type, + final LifecycleDefinition ld, + final WorkflowTemplate wf) { super.prepareSection(section, type, ld, wf); setDefaultTemplate("EFormDefaultTemplate", "eform-item", - (URL)get(m_template), + // (URL)get(m_template), + (InputStream) get(m_template), section, type,ld, wf); } Modified: contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertiesStep.java =================================================================== --- contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertiesStep.java 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertiesStep.java 2012-12-30 09:47:56 UTC (rev 2447) @@ -18,15 +18,14 @@ */ package com.arsdigita.camden.cms.contenttypes.ui; +import com.arsdigita.bebop.Component; import com.arsdigita.camden.cms.contenttypes.EForm; - -import com.arsdigita.bebop.Component; -import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; +import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.SimpleEditStep; +import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; -import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; /** @@ -60,6 +59,9 @@ * @pre itemModel != null * @return A component to display the state of the basic properties * of the release + * + * Method add deprecated, use add(GlobalizedMessage label, String attribute) + * instead (but probably Camden doesn't use globalized strings). */ public static Component getEFormPropertySheet( ItemSelectionModel itemModel ) { Modified: contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertyForm.java =================================================================== --- contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertyForm.java 2012-12-30 09:46:08 UTC (rev 2446) +++ contrib/camden/ccm-lbc-eforms/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertyForm.java 2012-12-30 09:47:56 UTC (rev 2447) @@ -18,7 +18,6 @@ */ package com.arsdigita.camden.cms.contenttypes.ui; -import com.arsdigita.camden.cms.contenttypes.EForm; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.FormInitListener; @@ -26,9 +25,7 @@ import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.form.TextField; -import com.arsdigita.bebop.parameters.ParameterModel; -import com.arsdigita.bebop.parameters.ParameterModel; -import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.camden.cms.contenttypes.EForm; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ui.authoring.BasicPageForm; @@ -56,6 +53,7 @@ /** * Adds widgets to the form. */ + @Override protected void addWidgets() { super.addWidgets(); |
