From 33c14e2ec3c17c769808ee2c9eeaaeba31467f97 Mon Sep 17 00:00:00 2001 From: pb Date: Thu, 20 May 2010 11:01:13 +0000 Subject: [PATCH] =?UTF-8?q?Sprachversion=20erg=C3=A4nzt,=20Directory=20Str?= =?UTF-8?q?uktur=20an=20Standard=20angepasst.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@432 8810af33-2d31-482b-a856-94f89814c4df --- .../{london/notes => cms/contentassets}/Notes.pdl | 2 +- .../src/ccm-cms-assets-notes.load | 4 ++-- .../{london/notes => cms/contentassets}/Note.java | 4 ++-- .../contentassets}/NotesInitializer.java | 15 +++++++-------- .../notes => cms/contentassets}/NotesLoader.java | 2 +- .../cms/contentassets/NotesResources.properties | 2 ++ .../contentassets/NotesResources_de.properties | 2 ++ .../contentassets}/ui/NotesDisplay.java | 4 ++-- .../notes => cms/contentassets}/ui/NotesEdit.java | 4 ++-- .../notes => cms/contentassets}/ui/NotesStep.java | 2 +- .../contentassets}/ui/NotesSummary.java | 4 ++-- .../london/notes/NotesResources.properties | 2 -- .../london/notes/NotesResources_de.properties | 2 -- 13 files changed, 24 insertions(+), 25 deletions(-) rename ccm-cms-assets-notes/pdl/com/arsdigita/{london/notes => cms/contentassets}/Notes.pdl (97%) rename ccm-cms-assets-notes/src/com/arsdigita/{london/notes => cms/contentassets}/Note.java (98%) rename ccm-cms-assets-notes/src/com/arsdigita/{london/notes => cms/contentassets}/NotesInitializer.java (85%) rename ccm-cms-assets-notes/src/com/arsdigita/{london/notes => cms/contentassets}/NotesLoader.java (96%) create mode 100755 ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesResources.properties create mode 100644 ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesResources_de.properties rename ccm-cms-assets-notes/src/com/arsdigita/{london/notes => cms/contentassets}/ui/NotesDisplay.java (98%) rename ccm-cms-assets-notes/src/com/arsdigita/{london/notes => cms/contentassets}/ui/NotesEdit.java (97%) rename ccm-cms-assets-notes/src/com/arsdigita/{london/notes => cms/contentassets}/ui/NotesStep.java (98%) rename ccm-cms-assets-notes/src/com/arsdigita/{london/notes => cms/contentassets}/ui/NotesSummary.java (97%) delete mode 100755 ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources.properties delete mode 100644 ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources_de.properties diff --git a/ccm-cms-assets-notes/pdl/com/arsdigita/london/notes/Notes.pdl b/ccm-cms-assets-notes/pdl/com/arsdigita/cms/contentassets/Notes.pdl similarity index 97% rename from ccm-cms-assets-notes/pdl/com/arsdigita/london/notes/Notes.pdl rename to ccm-cms-assets-notes/pdl/com/arsdigita/cms/contentassets/Notes.pdl index e55740ea0..9c959249c 100755 --- a/ccm-cms-assets-notes/pdl/com/arsdigita/london/notes/Notes.pdl +++ b/ccm-cms-assets-notes/pdl/com/arsdigita/cms/contentassets/Notes.pdl @@ -12,7 +12,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.london.notes; +model com.arsdigita.cms.contentassets; import com.arsdigita.cms.ContentItem; import com.arsdigita.kernel.ACSObject; diff --git a/ccm-cms-assets-notes/src/ccm-cms-assets-notes.load b/ccm-cms-assets-notes/src/ccm-cms-assets-notes.load index 1836cef9a..d1edd331f 100755 --- a/ccm-cms-assets-notes/src/ccm-cms-assets-notes.load +++ b/ccm-cms-assets-notes/src/ccm-cms-assets-notes.load @@ -7,10 +7,10 @@ - + - + diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/Note.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/Note.java similarity index 98% rename from ccm-cms-assets-notes/src/com/arsdigita/london/notes/Note.java rename to ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/Note.java index 021872687..9c33710f9 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/Note.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/Note.java @@ -14,7 +14,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.notes; +package com.arsdigita.cms.contentassets; import java.util.Date; @@ -40,7 +40,7 @@ import org.apache.log4j.Logger; */ public class Note extends ACSObject { public static final String BASE_DATA_OBJECT_TYPE = - "com.arsdigita.london.notes.Note"; + "com.arsdigita.cms.contentassets.Note"; private static final Logger s_log = Logger.getLogger( Note.class ); diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesInitializer.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesInitializer.java similarity index 85% rename from ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesInitializer.java rename to ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesInitializer.java index abf147efc..887bf73c2 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesInitializer.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesInitializer.java @@ -14,7 +14,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.notes; +package com.arsdigita.cms.contentassets; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentType; @@ -24,9 +24,8 @@ import com.arsdigita.cms.ui.authoring.SimpleEditStep; import com.arsdigita.domain.DomainObjectTraversal; import com.arsdigita.domain.SimpleDomainObjectTraversalAdapter; import com.arsdigita.globalization.GlobalizedMessage; -import com.arsdigita.london.notes.ui.NotesStep; -import com.arsdigita.london.notes.ui.NotesSummary; -import com.arsdigita.runtime.LegacyInitEvent; +import com.arsdigita.cms.contentassets.ui.NotesStep; +import com.arsdigita.cms.contentassets.ui.NotesSummary; import com.arsdigita.runtime.DomainInitEvent; public class NotesInitializer extends ContentAssetInitializer { @@ -52,15 +51,15 @@ public class NotesInitializer extends ContentAssetInitializer { public GlobalizedMessage getAuthoringStepLabel() { return new GlobalizedMessage( - "com.arsdigita.london.notes.authoring_step_label", - "com.arsdigita.london.notes.NotesResources" + "com.arsdigita.cms.contentassets.notes_authoring_step_label", + "com.arsdigita.cms.contentassets.NotesResources" ); } public GlobalizedMessage getAuthoringStepDescription() { return new GlobalizedMessage( - "com.arsdigita.london.notes.authoring_step_description", - "com.arsdigita.london.notes.NotesResources" + "com.arsdigita.cms.contentassets.notes_authoring_step_description", + "com.arsdigita.cms.contentassets.NotesResources" ); } diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesLoader.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesLoader.java similarity index 96% rename from ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesLoader.java rename to ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesLoader.java index 9841e9045..628bb67a4 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesLoader.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesLoader.java @@ -15,7 +15,7 @@ * package com.arsdigita.london.notes; */ -package com.arsdigita.london.notes; +package com.arsdigita.cms.contentassets; import com.arsdigita.runtime.ScriptContext; import com.arsdigita.loader.PackageLoader; diff --git a/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesResources.properties b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesResources.properties new file mode 100755 index 000000000..e1559cefe --- /dev/null +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesResources.properties @@ -0,0 +1,2 @@ +com.arsdigita.cms.contentassets.notes_authoring_step_label=Notes +com.arsdigita.cms.contentassets.notes_authoring_step_description=Attach notes to an item diff --git a/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesResources_de.properties b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesResources_de.properties new file mode 100644 index 000000000..cc0481fbe --- /dev/null +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesResources_de.properties @@ -0,0 +1,2 @@ +com.arsdigita.cms.contentassets.notes_authoring_step_label=Erg\u00E4nzende Notizen +com.arsdigita.cms.contentassets.notes_authoring_step_description=Erg\u00E4nzende Hinweise zu einem Dokument anf\u00FCgen. diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesDisplay.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesDisplay.java similarity index 98% rename from ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesDisplay.java rename to ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesDisplay.java index d6e5eff98..26d0da876 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesDisplay.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesDisplay.java @@ -14,7 +14,7 @@ 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.london.notes.ui; +package com.arsdigita.cms.contentassets.ui; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleComponent; @@ -30,7 +30,7 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.web.RedirectSignal; import com.arsdigita.xml.Element; -import com.arsdigita.london.notes.Note; +import com.arsdigita.cms.contentassets.Note; import java.io.IOException; diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesEdit.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesEdit.java similarity index 97% rename from ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesEdit.java rename to ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesEdit.java index 4fe0cee7d..9611a7070 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesEdit.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesEdit.java @@ -14,7 +14,7 @@ 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.london.notes.ui; +package com.arsdigita.cms.contentassets.ui; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.PageState; @@ -32,7 +32,7 @@ import com.arsdigita.cms.CMS; import com.arsdigita.cms.ContentSection; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.london.notes.Note; +import com.arsdigita.cms.contentassets.Note; public class NotesEdit extends SimpleContainer { private Form m_form; diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesStep.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesStep.java similarity index 98% rename from ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesStep.java rename to ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesStep.java index 9cbd70c4a..706766356 100755 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesStep.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesStep.java @@ -14,7 +14,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package com.arsdigita.london.notes.ui; +package com.arsdigita.cms.contentassets.ui; import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesSummary.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesSummary.java similarity index 97% rename from ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesSummary.java rename to ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesSummary.java index 5c3b26103..53dda015e 100644 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/ui/NotesSummary.java +++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/ui/NotesSummary.java @@ -1,4 +1,4 @@ -package com.arsdigita.london.notes.ui; +package com.arsdigita.cms.contentassets.ui; import java.text.DateFormat; import java.util.Date; @@ -17,7 +17,7 @@ import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ui.authoring.AdditionalDisplayComponent; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.User; -import com.arsdigita.london.notes.Note; +import com.arsdigita.cms.contentassets.Note; import com.arsdigita.persistence.DataCollection; import com.arsdigita.util.LockableImpl; diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources.properties b/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources.properties deleted file mode 100755 index 967857f29..000000000 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources.properties +++ /dev/null @@ -1,2 +0,0 @@ -com.arsdigita.london.notes.authoring_step_label=Notes -com.arsdigita.london.notes.authoring_step_description=Attach notes to an item diff --git a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources_de.properties b/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources_de.properties deleted file mode 100644 index 398fccc1f..000000000 --- a/ccm-cms-assets-notes/src/com/arsdigita/london/notes/NotesResources_de.properties +++ /dev/null @@ -1,2 +0,0 @@ -com.arsdigita.london.notes.authoring_step_label=Erg\u00E4nzende Notizen -com.arsdigita.london.notes.authoring_step_description=Erg\u00E4nzende Hinweise zu einem Dokument anf\u00FCgen.