- 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
master
jensp 2013-06-19 15:26:58 +00:00
parent b0936eb10e
commit 67c7b90ded
44 changed files with 728 additions and 46 deletions

View File

@ -2,7 +2,7 @@
<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
name="ccm-cms-publicpersonalprofile" name="ccm-cms-publicpersonalprofile"
prettyName="OpenCCM Content Type" prettyName="OpenCCM Content Type"
version="6.6.4" version="6.6.5"
release="1" release="1"
webapp="ROOT"> webapp="ROOT">
<ccm:dependencies> <ccm:dependencies>

View File

@ -2,8 +2,8 @@ model com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.web.Application; import com.arsdigita.web.Application;
object type PublicPersonalProfile extends Application { object type PublicPersonalProfiles extends Application {
reference key (publicpersonalprofile.application_id); reference key (publicpersonalprofiles.application_id);
} }
// Subquery for AbstractObjectList used as a filter // Subquery for AbstractObjectList used as a filter

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -0,0 +1 @@
com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfileAppManager

View File

@ -10,4 +10,7 @@
<version from="6.6.3" to="6.6.4"> <version from="6.6.3" to="6.6.4">
<script sql="ccm-cms-publicpersonalprofile/upgrade/::database::-6.6.3-6.6.4.sql"/> <script sql="ccm-cms-publicpersonalprofile/upgrade/::database::-6.6.3-6.6.4.sql"/>
</version> </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> </upgrade>

View File

@ -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; package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentBundle;

View File

@ -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; package com.arsdigita.cms.contenttypes;
import com.arsdigita.bebop.Page; import com.arsdigita.bebop.Page;

View File

@ -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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * 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 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
/** /**

View File

@ -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; package com.arsdigita.cms.contenttypes;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;

View File

@ -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; package com.arsdigita.cms.contenttypes;
import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainCollection;

View File

@ -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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * 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 * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.ColumnPanel; import com.arsdigita.bebop.ColumnPanel;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Component;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Component;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Component;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Component;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;

View File

@ -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; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;

View File

@ -1,6 +1,20 @@
/* /*
* To change this template, choose Tools | Templates * Copyright (c) 2011 Jens Pelzetter
* and open the template in the editor. *
* 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; package com.arsdigita.cms.contenttypes.ui;

View File

@ -41,3 +41,4 @@ publicpersonalprofile.ui.research_interests.title=Interests
publicpersonalprofile.ui.misc=Miscellaneous publicpersonalprofile.ui.misc=Miscellaneous
publicpersonalprofile.ui.misc.edit=Edit miscellaneous publicpersonalprofile.ui.misc.edit=Edit miscellaneous
publicpersonalprofile.ui.misc.title=Miscellaneous publicpersonalprofile.ui.misc.title=Miscellaneous
publicpersonalprofile.ui.no_nav_items=No navigation entries defined

View File

@ -41,3 +41,4 @@ publicpersonalprofile.ui.research_interests.title=Schwerpunkte
publicpersonalprofile.ui.misc=Sonstiges publicpersonalprofile.ui.misc=Sonstiges
publicpersonalprofile.ui.misc.edit=Sonstiges bearbeiten publicpersonalprofile.ui.misc.edit=Sonstiges bearbeiten
publicpersonalprofile.ui.misc.title=Sonstiges publicpersonalprofile.ui.misc.title=Sonstiges
publicpersonalprofile.ui.no_nav_items=Keine Navigationspunkte definiert

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;

View File

@ -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();
}
}

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.runtime.AbstractConfig; import com.arsdigita.runtime.AbstractConfig;

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;
@ -14,7 +32,7 @@ import java.math.BigDecimal;
public class PublicPersonalProfiles extends Application { public class PublicPersonalProfiles extends Application {
public static final String BASE_DATA_OBJECT_TYPE = 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(); private final static PublicPersonalProfileConfig config = new PublicPersonalProfileConfig(); // PublicPersonalProfileConfig.getConfig();
static { static {

View File

@ -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);
}
}

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.db.DbHelper; import com.arsdigita.db.DbHelper;

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile;
import com.arsdigita.cms.publicpersonalprofile.ui.PublicPersonalProfileNavItemsTable; import com.arsdigita.cms.publicpersonalprofile.ui.PublicPersonalProfileNavItemsTable;

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile.ui;
import com.arsdigita.bebop.ColumnPanel; import com.arsdigita.bebop.ColumnPanel;

View File

@ -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; package com.arsdigita.cms.publicpersonalprofile.ui;
import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Component;

View File

@ -198,7 +198,7 @@ public class AdminServlet extends BaseApplicationServlet
ApplicationsAdministrationTab appsAdministrationTab = ApplicationsAdministrationTab appsAdministrationTab =
new ApplicationsAdministrationTab(); new ApplicationsAdministrationTab();
SettingsTab settingsTab = new SettingsTab(); //SettingsTab settingsTab = new SettingsTab();
// Create the Admin's page tab bar, currently 2 elements: user & groups // 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(USER_TAB_TITLE, userSplitPanel);
tb.addTab(GROUP_TAB_TITLE, groupAdministrationTab); tb.addTab(GROUP_TAB_TITLE, groupAdministrationTab);
tb.addTab(APPLICATIONS_TAB_TITLE, appsAdministrationTab); tb.addTab(APPLICATIONS_TAB_TITLE, appsAdministrationTab);
tb.addTab("Settings", settingsTab); //tb.addTab("Settings", settingsTab);
browsePane.setTabbedPane(tb); browsePane.setTabbedPane(tb);
browsePane.setGroupAdministrationTab(groupAdministrationTab); browsePane.setGroupAdministrationTab(groupAdministrationTab);

View File

@ -19,6 +19,7 @@
package com.arsdigita.ui.admin; package com.arsdigita.ui.admin;
import com.arsdigita.bebop.BoxPanel; import com.arsdigita.bebop.BoxPanel;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.Page; import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.SimpleContainer;
@ -77,14 +78,14 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
final ApplicationTypeCollection applicationTypes = ApplicationType.retrieveAllApplicationTypes(); final ApplicationTypeCollection applicationTypes = ApplicationType.retrieveAllApplicationTypes();
final Map<String, ApplicationCreateForm<?>> createForms = retrieveAppCreateForms(); //final Map<String, ApplicationCreateForm<?>> createForms = retrieveAppCreateForms();
final Map<String, ApplicationManager<?>> managementForms = retrieveAppManagers(); final Map<String, ApplicationManager<?>> appManagers = retrieveAppManagers();
while (applicationTypes.next()) { while (applicationTypes.next()) {
if (applicationTypes.getApplicationType().isSingleton()) { if (applicationTypes.getApplicationType().isSingleton()) {
createSingletonAppPane(applicationTypes.getApplicationType(), managementForms); createSingletonAppPane(applicationTypes.getApplicationType(), appManagers);
} else { } else {
createAppPane(applicationTypes.getApplicationType(), createForms, managementForms); createAppPane(applicationTypes.getApplicationType(), appManagers);
} }
} }
@ -101,18 +102,15 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
add(panel); add(panel);
} }
@SuppressWarnings("rawtypes") // @SuppressWarnings("rawtypes")
private Map<String, ApplicationCreateForm<?>> retrieveAppCreateForms() { // private Map<String, ApplicationCreateForm<?>> retrieveAppCreateForms() {
final Map<String, ApplicationCreateForm<?>> appCreateForms = new HashMap<String, ApplicationCreateForm<?>>(); // final Map<String, ApplicationCreateForm<?>> appCreateForms = new HashMap<String, ApplicationCreateForm<?>>();
// final ServiceLoader<ApplicationCreateForm> loader = ServiceLoader.load(ApplicationCreateForm.class);
final ServiceLoader<ApplicationCreateForm> loader = ServiceLoader.load(ApplicationCreateForm.class); // for (ApplicationCreateForm<?> appCreateForm : loader) {
for (ApplicationCreateForm<?> appCreateForm : loader) { // appCreateForms.put(appCreateForm.getAppClassName(), appCreateForm);
appCreateForms.put(appCreateForm.getAppClassName(), appCreateForm); // }
} // return appCreateForms;
// }
return appCreateForms;
}
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private Map<String, ApplicationManager<?>> retrieveAppManagers() { private Map<String, ApplicationManager<?>> retrieveAppManagers() {
final Map<String, ApplicationManager<?>> appManagers = new HashMap<String, ApplicationManager<?>>(); 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, private void createSingletonAppPane(final ApplicationType applicationType,
final Map<String, ApplicationManager<?>> managementForms) { final Map<String, ApplicationManager<?>> appManagers) {
final String appObjectType = applicationType.getApplicationObjectType(); final String appObjectType = applicationType.getApplicationObjectType();
final ApplicationManager<?> manager = managementForms.get(appObjectType); final ApplicationManager<?> manager = appManagers.get(appObjectType);
final SingletonApplicationPane pane; final SingletonApplicationPane pane;
if (manager == null) { if (manager == null) {
pane = new SingletonApplicationPane(applicationType, null); pane = new SingletonApplicationPane(applicationType, null);
} else { } else {
pane = new SingletonApplicationPane( pane = new SingletonApplicationPane(
applicationType, managementForms.get(appObjectType).getApplicationAdminForm()); applicationType, appManagers.get(appObjectType).getApplicationAdminForm());
} }
appPanes.put(appObjectType, pane); appPanes.put(appObjectType, pane);
} }
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
private void createAppPane(final ApplicationType applicationType, private void createAppPane(final ApplicationType applicationType,
final Map<String, ApplicationCreateForm<?>> createForms, final Map<String, ApplicationManager<?>> appManagers) {
final Map<String, ApplicationManager<?>> managementForms) { final ApplicationManager<?> appManager = appManagers.get(applicationType.getApplicationObjectType());
final MultiInstanceApplicationPane<?> appPane = new MultiInstanceApplicationPane( final Form createForm;
applicationType, if (appManager == null) {
createForms.get(applicationType.getApplicationObjectType())); createForm = null;
} else {
createForm = appManager.getApplicationCreateForm();
}
final MultiInstanceApplicationPane<?> appPane = new MultiInstanceApplicationPane(applicationType, createForm);
appPanes.put(applicationType.getApplicationObjectType(), appPane); appPanes.put(applicationType.getApplicationObjectType(), appPane);
final ApplicationCollection instances = Application.retrieveAllApplications( final ApplicationCollection instances = Application.retrieveAllApplications(
applicationType.getApplicationObjectType()); applicationType.getApplicationObjectType());
while (instances.next()) { 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) { private void setPaneVisible(final SimpleContainer pane, final PageState state) {
if (visiblePane != null) { // if (visiblePane != null) {
visiblePane.setVisible(state, false); // 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); pane.setVisible(state, true);
visiblePane = pane; //visiblePane = pane;
} }
private class TreeStateChangeListener implements ChangeListener { private class TreeStateChangeListener implements ChangeListener {
@ -219,5 +229,6 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
} }
} }
} }
} }
} }

View File

@ -53,6 +53,7 @@ public class ApplicationInfoPropertySheetModel implements PropertySheetModel {
currentIndex++; currentIndex++;
return true; return true;
} else { } else {
currentIndex = -1;
return false; return false;
} }
} }
@ -77,7 +78,7 @@ public class ApplicationInfoPropertySheetModel implements PropertySheetModel {
return (String) GlobalizationUtil.globalize( return (String) GlobalizationUtil.globalize(
"ui.admin.applications.ApplicationInfoSection.singleton_instance.path.label").localize(); "ui.admin.applications.ApplicationInfoSection.singleton_instance.path.label").localize();
default: default:
return ""; return "unknown";
} }
} }

View File

@ -18,8 +18,10 @@
*/ */
package com.arsdigita.ui.admin.applications; package com.arsdigita.ui.admin.applications;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.Table; import com.arsdigita.bebop.Table;
import com.arsdigita.bebop.table.TableColumn; import com.arsdigita.bebop.table.TableColumn;
import com.arsdigita.bebop.table.TableModel; 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_URL = 1;
private final static int COL_DESC = 2; private final static int COL_DESC = 2;
public MultiInstanceApplicationPane(final ApplicationType applicationType, public MultiInstanceApplicationPane(final ApplicationType applicationType, final Form createForm) {
final ApplicationCreateForm<T> createForm) {
super(applicationType); super(applicationType);
final ApplicationCollection applications = Application.retrieveAllApplications(applicationType. final ApplicationCollection applications = Application.retrieveAllApplications(applicationType.