Renamed some forms to match naming conventions.

git-svn-id: https://svn.libreccm.org/ccm/trunk@487 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms/.classpath

@@ -6,5 +6,6 @@
 	<classpathentry kind="lib" path="lib/mlibwrapper_jai.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ccm-core"/>
+	<classpathentry kind="lib" path="/home/jensp/pwi/openccm/ccm/trunk/runtime/apache-tomcat-6.0.26/lib/servlet-api.jar"/>
 	<classpathentry kind="output" path="build/Eclipse"/>
 </classpath>

ccm-cms/.project

@@ -3,8 +3,34 @@
 	<name>ccm-cms</name>
 	<comment></comment>
 	<projects>
+		<project>ccm-cms-assets-fileattachment</project>
+		<project>ccm-cms-types-article</project>
+		<project>ccm-cms-types-event</project>
+		<project>ccm-cms-types-filestorageitem</project>
+		<project>ccm-cms-types-mparticle</project>
+		<project>ccm-cms-types-newsitem</project>
+		<project>ccm-cms-types-siteproxy</project>
+		<project>ccm-core</project>
+		<project>ccm-forum</project>
+		<project>ccm-ldn-aplaws</project>
+		<project>ccm-ldn-atoz</project>
+		<project>ccm-ldn-dublin</project>
+		<project>ccm-ldn-navigation</project>
+		<project>ccm-ldn-portal</project>
+		<project>ccm-ldn-rss</project>
+		<project>ccm-ldn-search</project>
+		<project>ccm-ldn-shortcuts</project>
+		<project>ccm-ldn-subsite</project>
+		<project>ccm-ldn-terms</project>
+		<project>ccm-ldn-theme</project>
+		<project>ccm-ldn-util</project>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -13,5 +39,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>

ccm-cms/.settings/org.eclipse.jdt.core.prefs

@@ -1,22 +1,25 @@
-#Fri May 04 16:16:11 CEST 2007
+#Tue Jul 20 17:23:53 CEST 2010
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=ignore
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
@@ -24,39 +27,48 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
 org.eclipse.jdt.core.compiler.problem.nullReference=ignore
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
 org.eclipse.jdt.core.compiler.problem.unusedLabel=ignore
 org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.source=1.6

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildAddForm.java

@@ -21,14 +21,14 @@ import org.apache.log4j.Logger;
 public class GenericOrganizationalUnitAddChildForm extends BasicItemForm {
 
     private static final Logger s_log = Logger.getLogger(
-            GenericOrganizationalUnitAddChildForm.class);
+            GenericOrganizationalUnitChildAddForm.class);
     private GenericOrganizationalUnitChildrenPropertiesStep m_step;
-    private ItemSearchWidget m_itemSearch;
+    private ItemSearchWidget m_itemSGenericOrganizationalUnitAddChildFormearch;
     private SaveCancelSection m_saveCancelSection;
     private final String ITEM_SEARCH = "orgaunitChild";
     private ItemSelectionModel m_itemModel;
 
-    public GenericOrganizationalUnitAddChildForm(ItemSelectionModel itemModel) {
+    public GenericOrganizationalUnitChildAddForm(ItemSelectionModel itemModel) {
         super("ChildAddForm", itemModel);        
     }
 

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildrenPropertiesStep.java

@@ -27,7 +27,7 @@ public class GenericOrganizationalUnitChildrenPropertiesStep extends SimpleEditS
             String prefix) {
         super(itemModel, parent, prefix);
 
-        BasicItemForm addChildSheet = new GenericOrganizationalUnitAddChildForm(
+        BasicItemForm addChildSheet = new GenericOrganizationalUnitChildAddForm(
                 itemModel);
         add(ADD_CHILD_SHEET_NAME,
             (String) ContenttypesGlobalizationUtil.globalize(

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java

@@ -21,19 +21,19 @@ import org.apache.log4j.Logger;
 
 /**
  *
- * @author jensp
+ * @author Jens Pelzetter
  */
-public class GenericOrganizationalUnitAddPersonForm extends BasicItemForm {
+public class GenericOrganizationalUnitPersonAddForm extends BasicItemForm {
 
     private static final Logger s_log = Logger.getLogger(
-            GenericOrganizationalUnitAddPersonForm.class);
+            GenericOrganizationalUnitPersonAddForm.class);
     private GenericOrganizationalUnitPersonPropertiesStep m_step;
     private ItemSearchWidget m_itemSearch;
     private SaveCancelSection m_saveCancelSection;
     private final String ITEM_SEARCH = "orgaunitPerson";
     private ItemSelectionModel m_itemModel;
 
-    public GenericOrganizationalUnitAddPersonForm(ItemSelectionModel itemModel) {
+    public GenericOrganizationalUnitPersonAddForm(ItemSelectionModel itemModel) {
         super("PersonAddForm", itemModel);
     }
 

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonPropertiesStep.java

@@ -27,7 +27,7 @@ public class GenericOrganizationalUnitPersonPropertiesStep extends SimpleEditSte
             String prefix) {
         super(itemModel, parent, prefix);
 
-        BasicItemForm addPersonSheet = new GenericOrganizationalUnitAddPersonForm(itemModel);
+        BasicItemForm addPersonSheet = new GenericOrganizationalUnitPersonAddForm(itemModel);
         add(ADD_PERSON_SHEET_NAME,
                 (String) ContenttypesGlobalizationUtil.globalize(
                 "cms.contenttypes.ui.genericorgaunit.add_person").localize(),

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertyForm.java

@@ -23,7 +23,7 @@ import org.apache.log4j.Logger;
 
 /**
  *
- * @author jensp
+ * @author Jens Pelzetter
  */
 public class GenericOrganizationalUnitPropertyForm extends BasicPageForm
         implements FormProcessListener, FormInitListener, FormSubmissionListener {
@@ -61,6 +61,7 @@ public class GenericOrganizationalUnitPropertyForm extends BasicPageForm
         ParameterModel addendumParam = new StringParameter(ADDENDUM);
         TextField addendum = new TextField(addendumParam);
         add(addendum);
+                
     }
 
     @Override

ccm-core/.classpath

@@ -30,7 +30,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry exported="true" kind="lib" path="etc/lib/javacc.jar"/>
-	<classpathentry exported="true" kind="lib" path="/usr/share/java/servlet.jar"/>
+	<classpathentry kind="lib" path="/home/jensp/pwi/openccm/ccm/trunk/runtime/apache-tomcat-6.0.26/lib/servlet-api.jar"/>
 	<classpathentry exported="true" kind="lib" path="/usr/share/java/jsp.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar" sourcepath="etc/src/commons-io-1.3.1-sources.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/ojdbc14.jar"/>

ccm-core/.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -13,5 +18,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>

ccm-core/src/log4j.properties

@@ -61,5 +61,3 @@ log4j.logger.com.arsdigita.packaging.Loader=INFO
 # For debugging all queries run by persistence
 #log4j.logger.com.redhat.persistence.engine.rdbms.RDBMSEngine=INFO
 
-log4j.logger.com.arsdigita.cms.contenttypes.ui.GenericOrganizationalUnitAddChildForm=DEBUG
-log4j.logger.com.arsdigita.cms.contenttypes.ui.OrganizationChildrenPropertiesStep=DEBUG