- Admin Form for the PublicPersonalProfile App integrated into new applications admin pane

- Added missing license headers in ccm-cms-publicpersonalprofile - Fixed name of the PublicPersonalProfiles App: The BASE_DATA_OBJECT_TYPE was PublicPersonalProfile instead of PublicPersonalProfiles. Also the app table is renamed to publicpersonalprofiles. Attention: Database-Upgrade 6.6.4-6.6.5 required! git-svn-id: https://svn.libreccm.org/ccm/trunk@2220 8810af33-2d31-482b-a856-94f89814c4df
2013-06-19 15:26:58 +00:00 · 2013-06-19 15:26:58 +00:00 · 67c7b90ded
parent b0936eb10e
commit 67c7b90ded
44 changed files with 728 additions and 46 deletions
--- a/ccm-cms-publicpersonalprofile/application.xml
+++ b/ccm-cms-publicpersonalprofile/application.xml
@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
 		 name="ccm-cms-publicpersonalprofile"
 		 prettyName="OpenCCM Content Type"
-		 version="6.6.4"
+		 version="6.6.5"
 		 release="1"
 		 webapp="ROOT">
    <ccm:dependencies>
--- a/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/publicpersonalprofile/PublicPersonalProfile.pdl
+++ b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/publicpersonalprofile/PublicPersonalProfile.pdl
@ -2,8 +2,8 @@ model com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.web.Application;

-object type PublicPersonalProfile extends Application {
-    reference key (publicpersonalprofile.application_id);
+object type PublicPersonalProfiles extends Application {
+    reference key (publicpersonalprofiles.application_id);
 }

 // Subquery for AbstractObjectList used as a filter
--- a/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/default/upgrade/6.6.4-6.6.5/fix_app_name.sql
+++ b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/default/upgrade/6.6.4-6.6.5/fix_app_name.sql
@ -0,0 +1,24 @@
+--
+-- Copyright (C) 2013 Jens Pelzetter All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id$
+
+UPDATE application_types 
+SET object_type = 'com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfiles' 
+WHERE object_type = 'com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfile';
+
+ALTER  TABLE publicpersonalprofile RENAME TO publicpersonalprofiles;
--- a/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/oracle-se-6.6.4-6.6.5.sql
+++ b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/oracle-se-6.6.4-6.6.5.sql
@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2013 Jens Pelzetter All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id$
+
+-- This update is only applicable for the internal development tree at
+-- University of Bremen !  Don't use for the APLAWS main trunk on
+-- fedorahosted!
+
+PROMPT ScientificCMS PublicPersonalProfile 6.6.4 -> 6.6.5 Upgrade Script  (Oracle)
+
+@@ ../default/upgrade/6.6.3-6.6.4/fix_app_name.sql
--- a/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/postgres-6.6.4-6.6.5.sql
+++ b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/postgres-6.6.4-6.6.5.sql
@ -0,0 +1,29 @@
+--
+-- Copyright (C) 2013 Jens Pelzetter All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id$
+
+-- This update is only applicable for the internal development tree at
+-- University of Bremen !  Don't use for the APLAWS main trunk on
+-- fedorahosted!
+\echo ScientificCMS PublicPersonalProfile 6.6.4 -> 6.6.5 Upgrade Script (PostgreSQL)
+
+begin;
+
+\i ../default/upgrade/6.6.4-6.6.5/fix_app_name.sql
+
+commit;
--- a/ccm-cms-publicpersonalprofile/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager
+++ b/ccm-cms-publicpersonalprofile/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager
@ -0,0 +1 @@
+com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfileAppManager
--- a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade
+++ b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade
@ -10,4 +10,7 @@
    <version from="6.6.3" to="6.6.4">
        <script sql="ccm-cms-publicpersonalprofile/upgrade/::database::-6.6.3-6.6.4.sql"/>        
    </version>
+    <version from="6.6.4" to="6.6.5">
+        <script sql="ccm-cms-publicpersonalprofile/upgrade/::database::-6.6.4-6.6.5.sql"/>        
+    </version>   
 </upgrade>
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileBundle.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileBundle.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes;

 import com.arsdigita.cms.ContentBundle;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileExtraXmlGenerator.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileExtraXmlGenerator.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes;

 import com.arsdigita.bebop.Page;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileLoader.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileLoader.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 - 2013 University of Bremen. All Rights Reserved.
+ * Copyright (c) 2011 Jens Pelzetter
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public License
@ -16,7 +16,6 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 */
-
 package com.arsdigita.cms.contenttypes;

 /**
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileNavItem.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileNavItem.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes;

 import com.arsdigita.domain.DataObjectNotFoundException;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileNavItemCollection.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileNavItemCollection.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes;

 import com.arsdigita.domain.DomainCollection;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2004 Jens Pelzetter All Rights Reserved.
+ * Copyright (c) 2011 Jens Pelzetter
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public License
@ -14,6 +14,7 @@
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
 */
 package com.arsdigita.cms.contenttypes;

--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.ColumnPanel;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscEditForm.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscEditForm.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.FormData;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscStep.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscStep.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.Component;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationAddForm.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.FormData;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationGeneratedAddForm.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationGeneratedAddForm.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.cms.ItemSelectionModel;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationStep.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationStep.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.cms.ItemSelectionModel;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.Component;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePositionEditForm.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePositionEditForm.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.FormData;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePositionStep.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePositionStep.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.Component;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertiesStep.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertiesStep.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.Component;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertyForm.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePropertyForm.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.FormData;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsEditForm.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsEditForm.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.contenttypes.ui;

 import com.arsdigita.bebop.FormData;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsStep.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsStep.java
@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
 */
 package com.arsdigita.cms.contenttypes.ui;

--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties
@ -41,3 +41,4 @@ publicpersonalprofile.ui.research_interests.title=Interests
 publicpersonalprofile.ui.misc=Miscellaneous
 publicpersonalprofile.ui.misc.edit=Edit miscellaneous
 publicpersonalprofile.ui.misc.title=Miscellaneous
+publicpersonalprofile.ui.no_nav_items=No navigation entries defined
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties
@ -41,3 +41,4 @@ publicpersonalprofile.ui.research_interests.title=Schwerpunkte
 publicpersonalprofile.ui.misc=Sonstiges
 publicpersonalprofile.ui.misc.edit=Sonstiges bearbeiten
 publicpersonalprofile.ui.misc.title=Sonstiges
+publicpersonalprofile.ui.no_nav_items=Keine Navigationspunkte definiert
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ContentGenerator.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ContentGenerator.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.bebop.PageState;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ExampleGenerator.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ExampleGenerator.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.bebop.PageState;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfileAppManager.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfileAppManager.java
@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2013 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+package com.arsdigita.cms.publicpersonalprofile;
+
+import com.arsdigita.bebop.SimpleContainer;
+import com.arsdigita.ui.admin.applications.AbstractSingletonApplicationManager;
+
+/**
+ *
+ * @author Jens Pelzetter <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class PublicPersonalProfileAppManager extends AbstractSingletonApplicationManager<PublicPersonalProfiles>{
+    
+    public Class<PublicPersonalProfiles> getApplication() {
+        return PublicPersonalProfiles.class;
+    }
+    
+    public SimpleContainer getApplicationAdminForm() {
+        return new PublicPersonalProfilesAdminPanel();
+    }
+    
+    
+}
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfileConfig.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfileConfig.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.runtime.AbstractConfig;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfileXmlGenerator.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfileXmlGenerator.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.bebop.PageState;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfiles.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfiles.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.domain.DataObjectNotFoundException;
@ -14,7 +32,7 @@ import java.math.BigDecimal;
 public class PublicPersonalProfiles extends Application {

    public static final String BASE_DATA_OBJECT_TYPE =
-            "com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfile";
+            "com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfiles";
    private final static PublicPersonalProfileConfig config = new PublicPersonalProfileConfig(); // PublicPersonalProfileConfig.getConfig();

    static {
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesAdminPanel.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesAdminPanel.java
@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2013 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+package com.arsdigita.cms.publicpersonalprofile;
+
+import com.arsdigita.bebop.BoxPanel;
+import com.arsdigita.bebop.Form;
+import com.arsdigita.bebop.FormSection;
+import com.arsdigita.bebop.Page;
+import com.arsdigita.bebop.ParameterSingleSelectionModel;
+import com.arsdigita.bebop.parameters.StringParameter;
+import com.arsdigita.cms.publicpersonalprofile.ui.PublicPersonalProfileNavItemsAddForm;
+import com.arsdigita.cms.publicpersonalprofile.ui.PublicPersonalProfileNavItemsTable;
+
+/**
+ *
+ * @author Jens Pelzetter <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class PublicPersonalProfilesAdminPanel extends BoxPanel {
+
+    private final StringParameter navItemKeyParam;    
+
+    public PublicPersonalProfilesAdminPanel() {
+        super(BoxPanel.VERTICAL);
+
+        navItemKeyParam = new StringParameter("selectedNavItem");
+        final ParameterSingleSelectionModel navItemSelect = new ParameterSingleSelectionModel(navItemKeyParam);
+        
+        final Form form = new Form("PublicPersonalProfileAdmin");        
+        final BoxPanel panel = new BoxPanel(BoxPanel.VERTICAL);
+        final FormSection tableSection = new FormSection(panel);        
+        final PublicPersonalProfileNavItemsAddForm addForm = new PublicPersonalProfileNavItemsAddForm(navItemSelect);
+        final PublicPersonalProfileNavItemsTable table = new PublicPersonalProfileNavItemsTable(navItemSelect);
+        
+        panel.add(table);
+        form.add(tableSection);        
+        panel.add(addForm);        
+        add(form);
+    }
+
+    @Override
+    public void register(final Page page) {
+        page.addGlobalStateParam(navItemKeyParam);
+    }
+
+}
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesInitializer.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesInitializer.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.db.DbHelper;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesLoader.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesLoader.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.kernel.Kernel;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile;

 import com.arsdigita.cms.publicpersonalprofile.ui.PublicPersonalProfileNavItemsTable;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ui/PublicPersonalProfileNavItemsAddForm.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ui/PublicPersonalProfileNavItemsAddForm.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile.ui;

 import com.arsdigita.bebop.ColumnPanel;
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ui/PublicPersonalProfileNavItemsTable.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/ui/PublicPersonalProfileNavItemsTable.java
@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2011 Jens Pelzetter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 package com.arsdigita.cms.publicpersonalprofile.ui;

 import com.arsdigita.bebop.Component;
--- a/ccm-core/src/com/arsdigita/ui/admin/AdminServlet.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/AdminServlet.java
@ -198,7 +198,7 @@ public class AdminServlet extends BaseApplicationServlet
        ApplicationsAdministrationTab appsAdministrationTab =
                                      new ApplicationsAdministrationTab();

-        SettingsTab settingsTab = new SettingsTab();
+        //SettingsTab settingsTab = new SettingsTab();


        // Create the Admin's page tab bar, currently 2 elements: user & groups
@ -208,7 +208,7 @@ public class AdminServlet extends BaseApplicationServlet
        tb.addTab(USER_TAB_TITLE, userSplitPanel);
        tb.addTab(GROUP_TAB_TITLE, groupAdministrationTab);
        tb.addTab(APPLICATIONS_TAB_TITLE, appsAdministrationTab);
-        tb.addTab("Settings", settingsTab);
+        //tb.addTab("Settings", settingsTab);

        browsePane.setTabbedPane(tb);
        browsePane.setGroupAdministrationTab(groupAdministrationTab);
--- a/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java
@ -19,6 +19,7 @@
 package com.arsdigita.ui.admin;

 import com.arsdigita.bebop.BoxPanel;
+import com.arsdigita.bebop.Form;
 import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleContainer;
@ -77,14 +78,14 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons

        final ApplicationTypeCollection applicationTypes = ApplicationType.retrieveAllApplicationTypes();

-        final Map<String, ApplicationCreateForm<?>> createForms = retrieveAppCreateForms();
-        final Map<String, ApplicationManager<?>> managementForms = retrieveAppManagers();
+        //final Map<String, ApplicationCreateForm<?>> createForms = retrieveAppCreateForms();
+        final Map<String, ApplicationManager<?>> appManagers = retrieveAppManagers();

        while (applicationTypes.next()) {
            if (applicationTypes.getApplicationType().isSingleton()) {
-                createSingletonAppPane(applicationTypes.getApplicationType(), managementForms);
+                createSingletonAppPane(applicationTypes.getApplicationType(), appManagers);
            } else {
-                createAppPane(applicationTypes.getApplicationType(), createForms, managementForms);
+                createAppPane(applicationTypes.getApplicationType(), appManagers);
            }
        }

@ -101,18 +102,15 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
        add(panel);
    }

-    @SuppressWarnings("rawtypes")
-    private Map<String, ApplicationCreateForm<?>> retrieveAppCreateForms() {
-        final Map<String, ApplicationCreateForm<?>> appCreateForms = new HashMap<String, ApplicationCreateForm<?>>();
-
-        final ServiceLoader<ApplicationCreateForm> loader = ServiceLoader.load(ApplicationCreateForm.class);
-        for (ApplicationCreateForm<?> appCreateForm : loader) {
-            appCreateForms.put(appCreateForm.getAppClassName(), appCreateForm);
-        }
-
-        return appCreateForms;
-    }
-
+//    @SuppressWarnings("rawtypes")
+//    private Map<String, ApplicationCreateForm<?>> retrieveAppCreateForms() {
+//        final Map<String, ApplicationCreateForm<?>> appCreateForms = new HashMap<String, ApplicationCreateForm<?>>();
+//        final ServiceLoader<ApplicationCreateForm> loader = ServiceLoader.load(ApplicationCreateForm.class);
+//        for (ApplicationCreateForm<?> appCreateForm : loader) {
+//            appCreateForms.put(appCreateForm.getAppClassName(), appCreateForm);
+//        }
+//        return appCreateForms;
+//    }
    @SuppressWarnings("rawtypes")
    private Map<String, ApplicationManager<?>> retrieveAppManagers() {
        final Map<String, ApplicationManager<?>> appManagers = new HashMap<String, ApplicationManager<?>>();
@ -126,34 +124,39 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
    }

    private void createSingletonAppPane(final ApplicationType applicationType,
-                                        final Map<String, ApplicationManager<?>> managementForms) {
+                                        final Map<String, ApplicationManager<?>> appManagers) {
        final String appObjectType = applicationType.getApplicationObjectType();

-        final ApplicationManager<?> manager = managementForms.get(appObjectType);
+        final ApplicationManager<?> manager = appManagers.get(appObjectType);
        final SingletonApplicationPane pane;
        if (manager == null) {
            pane = new SingletonApplicationPane(applicationType, null);
        } else {
            pane = new SingletonApplicationPane(
-                    applicationType, managementForms.get(appObjectType).getApplicationAdminForm());
+                    applicationType, appManagers.get(appObjectType).getApplicationAdminForm());
        }
        appPanes.put(appObjectType, pane);
    }

    @SuppressWarnings({"rawtypes", "unchecked"})
    private void createAppPane(final ApplicationType applicationType,
-                               final Map<String, ApplicationCreateForm<?>> createForms,
-                               final Map<String, ApplicationManager<?>> managementForms) {
-        final MultiInstanceApplicationPane<?> appPane = new MultiInstanceApplicationPane(
-                applicationType,
-                createForms.get(applicationType.getApplicationObjectType()));
+                               final Map<String, ApplicationManager<?>> appManagers) {
+        final ApplicationManager<?> appManager = appManagers.get(applicationType.getApplicationObjectType());
+        final Form createForm;
+        if (appManager == null) {
+            createForm = null;
+        } else {
+            createForm = appManager.getApplicationCreateForm();
+        }
+
+        final MultiInstanceApplicationPane<?> appPane = new MultiInstanceApplicationPane(applicationType, createForm);
        appPanes.put(applicationType.getApplicationObjectType(), appPane);

        final ApplicationCollection instances = Application.retrieveAllApplications(
                applicationType.getApplicationObjectType());

        while (instances.next()) {
-            createInstancePane(instances.getApplication(), managementForms);
+            createInstancePane(instances.getApplication(), appManagers);
        }
    }

@ -185,12 +188,19 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
    }

    private void setPaneVisible(final SimpleContainer pane, final PageState state) {
-        if (visiblePane != null) {
-            visiblePane.setVisible(state, false);
+//        if (visiblePane != null) {
+//            visiblePane.setVisible(state, false);
+//        }
+        
+        for(Map.Entry<String, BaseApplicationPane> entry : appPanes.entrySet()) {
+            entry.getValue().setVisible(state, false);
+        }
+        for(Map.Entry<String, ApplicationInstancePane> entry : instancePanes.entrySet()) {
+            entry.getValue().setVisible(state, false);
        }

        pane.setVisible(state, true);
-        visiblePane = pane;
+        //visiblePane = pane;
    }

    private class TreeStateChangeListener implements ChangeListener {
@ -219,5 +229,6 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
                }
            }
        }
+
    }
 }
--- a/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInfoPropertySheetModel.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInfoPropertySheetModel.java
@ -53,6 +53,7 @@ public class ApplicationInfoPropertySheetModel implements PropertySheetModel {
            currentIndex++;
            return true;
        } else {
+            currentIndex = -1;
            return false;
        }
    }
@ -77,7 +78,7 @@ public class ApplicationInfoPropertySheetModel implements PropertySheetModel {
                return (String) GlobalizationUtil.globalize(
                        "ui.admin.applications.ApplicationInfoSection.singleton_instance.path.label").localize();
            default:
-                return "";
+                return "unknown";
        }
    }

--- a/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java
@ -18,8 +18,10 @@
 */
 package com.arsdigita.ui.admin.applications;

+import com.arsdigita.bebop.Form;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.Table;
 import com.arsdigita.bebop.table.TableColumn;
 import com.arsdigita.bebop.table.TableModel;
@ -44,8 +46,7 @@ public class MultiInstanceApplicationPane<T extends Application> extends BaseApp
    private final static int COL_URL = 1;
    private final static int COL_DESC = 2;

-    public MultiInstanceApplicationPane(final ApplicationType applicationType,
-                                        final ApplicationCreateForm<T> createForm) {
+    public MultiInstanceApplicationPane(final ApplicationType applicationType, final Form createForm) {
        super(applicationType);

        final ApplicationCollection applications = Application.retrieveAllApplications(applicationType.
				`@ -0,0 +1 @@`
				`com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfileAppManager`