JBoss Portal SVN: r13778 - docs/enterprise/trunk/User_Guide/ja-JP.
by portal-commits＠lists.jboss.org
Author: khashida(a)redhat.com
Date: 2009-08-19 04:41:08 -0400 (Wed, 19 Aug 2009)
New Revision: 13778
Modified:
docs/enterprise/trunk/User_Guide/ja-JP/JBoss_Portal_Basics.po
Log:
20 left in Basics
Modified: docs/enterprise/trunk/User_Guide/ja-JP/JBoss_Portal_Basics.po
===================================================================
--- docs/enterprise/trunk/User_Guide/ja-JP/JBoss_Portal_Basics.po 2009-08-18 08:56:09 UTC (rev 13777)
+++ docs/enterprise/trunk/User_Guide/ja-JP/JBoss_Portal_Basics.po 2009-08-19 08:41:08 UTC (rev 13778)
@@ -1,29 +1,32 @@
+# translation of JBoss_Portal_Basics.po to Japanese
# Language ja-JP translations for User_Guide package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: User_Guide VERSION\n"
+"Project-Id-Version: JBoss_Portal_Basics\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:58+0000\n"
-"PO-Revision-Date: 2009-08-14 00:58+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-19 17:40+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: JBoss_Portal_Basics.xml:6
#, no-c-format
msgid "JBoss Portal Basics"
-msgstr ""
+msgstr "JBoss Portal の基本"
#. Tag: title
#: JBoss_Portal_Basics.xml:10
#, no-c-format
msgid "Portal Concepts - Illustrated"
-msgstr ""
+msgstr "Portal の概念：解説"
#. Tag: para
#: JBoss_Portal_Basics.xml:12
@@ -32,12 +35,14 @@
"This section will introduce the reader to some basic portal terms and "
"concepts used within JBoss Portal and throughout this document."
msgstr ""
+"このセクションでは、基本的な Portal 用語と、JBoss Portal 及び "
+"このドキュメント内で使用されている概念を読者の皆さんに紹介しています。"
#. Tag: title
#: JBoss_Portal_Basics.xml:19
#, no-c-format
msgid "Portal Instances"
-msgstr ""
+msgstr "Portal インスタンス"
#. Tag: para
#: JBoss_Portal_Basics.xml:21
@@ -49,6 +54,10 @@
"manages the relationship between the user and the portal itself. The "
"hierarchy of portal objects is depicted in the following diagram:"
msgstr ""
+"JBoss Portal は１つのコンテナ内で実行している複数の Portal インスタンスをサポートします。 "
+"Portal インスタンスの１つはバケツとして見ることができます。それが Portal Pages、Themes 、 "
+"Layouts、及び Portlet Windows などの Portal オブジェクトを含みます。またユーザーと "
+"Portal 自身との関係も管理します。Portal オブジェクトの階級は以下の表で示されています:"
#. Tag: para
#: JBoss_Portal_Basics.xml:32
@@ -62,12 +71,19 @@
"administrator for information on the available portal instances - some of "
"which may have restricted logins. ."
msgstr ""
+"portal インスタンスは、url 形式 ：<emphasis>http://"
+"<replaceable>[domain]</replaceable>/<replaceable>[context]</replaceable>/"
+"portal/<replaceable>[portal_name]</replaceable></emphasis> で到達できます。 "
+"デフォルト/ローカルのインストールでは、 <emphasis>default</emphasis> portal "
+"インスタンスは http://localhost:8080/portal/portal/default で到達できます。利用可能な "
+"portal インスタンスについての情報は、該当する portal 管理者に相談して下さい。その "
+"一部ではログインが制限されています。"
#. Tag: title
#: JBoss_Portal_Basics.xml:45
#, no-c-format
msgid "Pages"
-msgstr ""
+msgstr "Pages"
#. Tag: para
#: JBoss_Portal_Basics.xml:46
@@ -78,6 +94,10 @@
"all of the HTML markup created by the individual portlets, decorates them "
"with window controls, and presents them to the user as a consolidated page."
msgstr ""
+"Portal Page は Portlet Windows の集約です。これは反応フェーズ中に portal によって "
+"生成されます。このフェーズ中に portal は、個別の portlets によって作成された HTML "
+"markup の全てを集約し、それらをウィンドウ制御で装飾して、それからそれらを結合した "
+"ページとしてユーザーに提供します。"
#. Tag: para
#: JBoss_Portal_Basics.xml:50
@@ -91,19 +111,25 @@
"default . Likewise, the News Page in a default install can be reached at "
"http://localhost:8080/portal/portal/default/News"
msgstr ""
+"それぞれの portal page は url 形式： <emphasis>http://<replaceable>"
+"[domain]</replaceable>/<replaceable>[context]</replaceable>/portal/"
+"<replaceable>[portal_name]</replaceable>/<replaceable>[page_name]</"
+"replaceable></emphasis> で到達できます。デフォルト/ローカルのインストールでは、 "
+"<emphasis>default</emphasis> ページは http://localhost:8080/portal/portal/default/"
+"default で到達できます。同様にして、デフォルトインストールの News Page は "
+"http://localhost:8080/portal/portal/default/News で到達できます。"
#. Tag: para
#: JBoss_Portal_Basics.xml:64
#, no-c-format
-msgid ""
-"More, on navigating the portal pages and what they contain can be found in,"
-msgstr ""
+msgid "More, on navigating the portal pages and what they contain can be found in,"
+msgstr "portal pages への移動について、及びそれらが収納している内容については以下で見ることができます："
#. Tag: title
#: JBoss_Portal_Basics.xml:72
#, no-c-format
msgid "Portlet Windows"
-msgstr ""
+msgstr "Portlet Windows"
#. Tag: para
#: JBoss_Portal_Basics.xml:73
@@ -115,6 +141,11 @@
"mediaobject> The diagram above shows the default JBoss Portal page with "
"certain window-related items highlighted (in red). Lets look at these items:"
msgstr ""
+"Portlet Windows は Portal Pages で見ることができるもので、特定の portlet インスタンスに "
+"関する HTML markup を収納しています。<mediaobject> <imageobject> <imagedata fileref="
+"\"images/intro/window.jpg\" format=\"JPG\" scalefit=\"1\"/> </imageobject> </"
+"mediaobject> 上記の表では、（赤字で）強調した特定の window 関連の項目を持つデフォルトの "
+"JBoss Portal page を示しています。これらの項目を見てみましょう:"
#. Tag: para
#: JBoss_Portal_Basics.xml:88
@@ -123,6 +154,8 @@
"<emphasis role=\"bold\">Window Title:</emphasis> Defines the content and "
"purpose of the individual portlet window."
msgstr ""
+"<emphasis role=\"bold\">Window Title:</emphasis> 個別の portlet window の "
+"内容と目的を定義します。"
#. Tag: para
#: JBoss_Portal_Basics.xml:94
@@ -131,6 +164,8 @@
"<emphasis role=\"bold\">Window Fragment:</emphasis> Generated HTML markup "
"produced by the portlet on the server-side."
msgstr ""
+"<emphasis role=\"bold\">Window Fragment:</emphasis> サーバー側で portlet によって "
+"作られた生成済みの HTML markup です。"
#. Tag: para
#: JBoss_Portal_Basics.xml:100
@@ -147,36 +182,46 @@
"all portlets support all defined window states and/or portlet modes. The "
"table below explains the different Window State icons and their meaning."
msgstr ""
+"<emphasis role=\"bold\">Window Controls:</emphasis> Window controls は "
+"２つのカテゴリに分割されており、生成されたマークアップにユーザーがインパクトを "
+"与える方法の異なる側面を制御します。それぞれのウィンドウ制御はウィンドウと "
+"特定の方法で交流するようにクリックすることができます。<emphasis role=\"bold\">Window "
+"State</emphasis> アイコンは、ページ内でウィンドウが取るスペースの量と表示する "
+"マークアップの量を制御します。それに対して <emphasis role=\"bold\">Portlet "
+"Mode</emphasis> アイコンは、portlet が運営するモードを制御して、 "
+"生成されるマークアップのタイプにインパクトを与えます。全てのマークアップが全ての "
+"定義済み window state や portlet mode をサポートする訳ではないことに注意して "
+"下さい。以下の表では、各種の Window State アイコンとそれらの意味を説明します。"
#. Tag: title
#: JBoss_Portal_Basics.xml:113
#, no-c-format
msgid "Window state icons and their meaning"
-msgstr ""
+msgstr "Window state アイコンとその意味"
#. Tag: entry
#: JBoss_Portal_Basics.xml:120
#, no-c-format
msgid "Window State"
-msgstr ""
+msgstr "Window State （ウィンドウの状態）"
#. Tag: entry
#: JBoss_Portal_Basics.xml:123
#, no-c-format
msgid "Icon"
-msgstr ""
+msgstr "アイコン"
#. Tag: entry
#: JBoss_Portal_Basics.xml:126
#, no-c-format
msgid "Meaning"
-msgstr ""
+msgstr "意味"
#. Tag: entry
#: JBoss_Portal_Basics.xml:134
#, no-c-format
msgid "Normal"
-msgstr ""
+msgstr "Normal（通常）"
#. Tag: entry
#: JBoss_Portal_Basics.xml:146
@@ -186,30 +231,33 @@
"above image are in the normal window state). The portlet window will occupy "
"only enough space to show the portlet content on the page."
msgstr ""
+"Normal window state は portlets では最も一般的な状態です（上記イメージの portlets が "
+"normal window state です）。portlet window はページの portlet 内容を表示するのに十分な "
+"スペースのみを占有します。"
#. Tag: entry
#: JBoss_Portal_Basics.xml:154
#, no-c-format
msgid "Minimized"
-msgstr ""
+msgstr "Minimized（最小化）"
#. Tag: entry
#: JBoss_Portal_Basics.xml:165
#, no-c-format
msgid "The portlet is instructed to render minimal-to-no markup."
-msgstr ""
+msgstr "portlet は無しに近い最小限のマークアップを描写するように指示されます。"
#. Tag: entry
#: JBoss_Portal_Basics.xml:170
#, no-c-format
msgid "Maximized"
-msgstr ""
+msgstr "Maximized（最大化）"
#. Tag: entry
#: JBoss_Portal_Basics.xml:181
#, no-c-format
msgid "The portlet window can occupy as much space of real estate on the page."
-msgstr ""
+msgstr "portlet window はページ上で可能な限りの広域スペースを占有できます。"
#. Tag: para
#: JBoss_Portal_Basics.xml:191
@@ -221,6 +269,10 @@
"as in this mode, the portlet preferences can be modified to be individually "
"suited to a particular user's needs."
msgstr ""
+"<emphasis role=\"bold\">Portlet Modes とその意味:</emphasis>Portlet Modes は "
+"常に利用できる訳ではありません（任意のモード用の portlet サポートにより変化）。更には、 "
+"Edit mode では portlet 個人設定が特定のユーザーニーズに対応するように個別に修正可能なため "
+"このモードでは ログインしたユーザーにのみ利用可能です。"
#. Tag: para
#: JBoss_Portal_Basics.xml:203
@@ -229,6 +281,8 @@
"<emphasis role=\"bold\">Edit</emphasis> : Only visible to logged-in users. "
"Allows a logged-in user to customize the portlet's preferences."
msgstr ""
+"<emphasis role=\"bold\">Edit</emphasis> : ログインしたユーザーにのみ表示されます。 "
+"ログインユーザーは portlet の個人設定をカスタマイズできます。"
#. Tag: para
#: JBoss_Portal_Basics.xml:215
@@ -240,6 +294,11 @@
"the user understands that by clicking it the user will leave the \"Edit mode"
"\" and revert back to \"View mode\". Portlets are by default in View mode."
msgstr ""
+"<emphasis role=\"bold\">Return to View mode</emphasis> : 'Cancel' のラベルの付いた "
+"ボタンはユーザーがログインして、現在の window に関連した portlet が "
+"Edit mode である時にのみ表示されます。これが Edit ボタンから入れ替るため、"
+"ユーザーはそれをクリックすると \"Edit mode\" を退出して、\"View mode\" に戻ることを "
+"認識できます。Portlets はデフォルトで View mode になっています。"
#. Tag: para
#: JBoss_Portal_Basics.xml:230
@@ -248,12 +307,14 @@
"<emphasis role=\"bold\">Help</emphasis> : Allows a user to access useful "
"information about the portlet."
msgstr ""
+"<emphasis role=\"bold\">Help</emphasis> : ユーザーが portlet に関する有用な情報に "
+"アクセスできるようにします。"
#. Tag: title
#: JBoss_Portal_Basics.xml:243
#, no-c-format
msgid "Default Portal installation"
-msgstr ""
+msgstr "デフォルトの Portal インストール"
#. Tag: para
#: JBoss_Portal_Basics.xml:245
@@ -262,12 +323,14 @@
"This section covers the default Portal installation and the pages and "
"portlets that come with it."
msgstr ""
+"このセクションでは、デフォルトの Portal インストール、及びそれに添付されている "
+"pages と portlets の説明をしています。"
#. Tag: title
#: JBoss_Portal_Basics.xml:251
#, no-c-format
msgid "Default Portal Pages"
-msgstr ""
+msgstr "デフォルトの Portal Pages"
#. Tag: para
#: JBoss_Portal_Basics.xml:253
@@ -279,6 +342,10 @@
"Portal_Pages\"/>, or by clicking the tab associated to the page in the "
"Navigation Tabs at the top of the page."
msgstr ""
+"デフォルトの Portal では、Home、News、及び Weather の３つのページが利用できます。 "
+"これらのページにアクセスするには、<xref linkend=\"Portal_User_Guide-Portal_Concepts-"
+"Portal_Pages\"/> で示してあるように、ブラウザのロケーションバーにページの URL を "
+"入力するか、又はページの上部の Navigation タブ内にあるページに関連したタブをクリックします。"
#. Tag: para
#: JBoss_Portal_Basics.xml:267
@@ -290,6 +357,11 @@
"for those subpages: <mediaobject> <imageobject> <imagedata fileref=\"images/"
"intro/nav_sub.png\" format=\"PNG\"/> </imageobject> </mediaobject> , ."
msgstr ""
+"デフォルトの Portal インストールには、サブページを持つページはありませんが、 "
+"navigation タブを設定してサブページ navigation をサポートするようにすることが "
+"できます。子ページのあるタブ上でマウスを動かすとそれらのサブページ用のメニューが "
+"表示されます。<mediaobject> <imageobject> <imagedata fileref=\"images/"
+"intro/nav_sub.png\" format=\"PNG\"/> </imageobject> </mediaobject>"
#. Tag: para
#: JBoss_Portal_Basics.xml:278
@@ -300,12 +372,16 @@
"want to see or even create your own personal Dashboard, as explained in "
"<xref linkend=\"Portal_User_Guide-JBoss_Portal_Basics-Dashboard\"/> ."
msgstr ""
+"Portal を無記名で使用することはできるのですが、 "
+"<xref linkend=\"Portal_User_Guide-JBoss_Portal_Basics-Dashboard\"/> で説明があるように、 "
+"ログインすると見たいコンテンツをカスタマイズしたり、自分自身の Dashboard を作成したりする機会を "
+"得るため、作業がもっと興味深いものになります。"
#. Tag: title
#: JBoss_Portal_Basics.xml:286
#, no-c-format
msgid "Logging in to the Portal"
-msgstr ""
+msgstr "Portal へのログイン"
#. Tag: para
#: JBoss_Portal_Basics.xml:288
@@ -321,6 +397,14 @@
"can alter Portal's content (login: <literal>admin</literal>, password: "
"<literal>admin</literal>)."
msgstr ""
+"portal へのログインには、portal ページの右上にある <emphasis>Login</"
+"emphasis> リンクをクリックします。そうすると portal が、ユーザーの信任状を "
+"入力できるログイン画面を提示します。<mediaobject> "
+"<imageobject> <imagedata fileref=\"images/intro/login_ss.png\" format=\"PNG"
+"\"/> </imageobject> </mediaobject> デフォルトの Portal インストールは２つの "
+"ユーザーを定義します。特権のないレギュラーユーザー（ログイン <literal>user</"
+"literal>、パスワード <literal>user</literal>）と Portal のコンテンツを変更できる "
+"管理ユーザー（ログイン <literal>admin</literal>、パスワード <literal>admin</literal>）です。"
#. Tag: para
#: JBoss_Portal_Basics.xml:306
@@ -330,6 +414,9 @@
"your personal dashboard or log out. If you have access to other portal "
"instances, they will be shown here as well."
msgstr ""
+"ログインすると、右上のメニューが変化してユーザー個人の dashboard に移動するか、 "
+"又はログアウトすることができるようになります。他の portal インスタンスにアクセスを "
+"所有している場合は、それらもここで表示されます。"
#. Tag: para
#: JBoss_Portal_Basics.xml:317
@@ -338,18 +425,20 @@
"If you login as an administrator, you will also be presented with a link to "
"the <emphasis role=\"bold\">Admin</emphasis> portal."
msgstr ""
+"管理者としてログインすると、<emphasis role=\"bold\">Admin</emphasis> portal への "
+"リンクも提示されます。"
#. Tag: title
#: JBoss_Portal_Basics.xml:326
#, no-c-format
msgid "Home Page"
-msgstr ""
+msgstr "ホームページ"
#. Tag: title
#: JBoss_Portal_Basics.xml:331
#, no-c-format
msgid "Greetings Portlet"
-msgstr ""
+msgstr "Greetings Portlet"
#. Tag: para
#: JBoss_Portal_Basics.xml:337
@@ -360,12 +449,15 @@
"right from the first page, three heteregenous components, a JSP portlet, a "
"JSF portlet and a CMS content."
msgstr ""
+"Greetings Portlet は ログイン時にデフォルトの認証情報と共に、公式ドキュメントへのリンクも "
+"表示します。これは JSP を使用して最初のページから、JSP portlet、JSF portlet、及び "
+"CMS コンテンツの３つの異なるコンポーネンツを表示します。"
#. Tag: title
#: JBoss_Portal_Basics.xml:346
#, no-c-format
msgid "Identity User Portlet"
-msgstr ""
+msgstr "Identity User Portlet"
#. Tag: para
#: JBoss_Portal_Basics.xml:349
@@ -375,6 +467,9 @@
"Managing_Users\"/> for managing the portal user base. Only user operations "
"are covered in this section."
msgstr ""
+"portal のユーザーベースを管理するために、管理者は <xref linkend=\"Portal_User_Guide-User_Role-"
+"Managing_Users\"/> を確認してみるべきです。このセクションではユーザー操作のみがカバーされて "
+"います。"
#. Tag: para
#: JBoss_Portal_Basics.xml:361
@@ -387,12 +482,17 @@
"\"/> </imageobject> </mediaobject> The Identity User Portlet allows a user "
"to:"
msgstr ""
+"Identity User Portlet に正常にログインすると、ユーザーは随意に追加の機能を "
+"得るようになります。これは以下のセクションでカバーされています。<mediaobject> <imageobject> <imagedata fileref=\"images/intro/"
+"user_portlet_loggedin.png\" format=\"PNG\" align=\"center\" valign=\"middle"
+"\"/> </imageobject> </mediaobject> Identity User Portlet の使用でユーザーは以下のことが "
+"できるようになります:"
#. Tag: emphasis
#: JBoss_Portal_Basics.xml:376
#, no-c-format
msgid "Create a new account"
-msgstr ""
+msgstr "新規アカウントの作成"
#. Tag: para
#: JBoss_Portal_Basics.xml:378
@@ -402,12 +502,15 @@
"emphasis> link in the navigation of the portlet. A user can then fill in the "
"necessary information to create an account on the system:"
msgstr ""
+"新規アカウントの作成は portlet のナビゲーションにある <emphasis role=\"bold\">Register</"
+"emphasis> リンクをクリックすると可能になります。ユーザーはそれから必要な情報を記入して "
+"システム上にアカウントを作成します:"
#. Tag: emphasis
#: JBoss_Portal_Basics.xml:392
#, no-c-format
msgid "Lost password"
-msgstr ""
+msgstr "紛失パスワード"
#. Tag: para
#: JBoss_Portal_Basics.xml:394
@@ -418,12 +521,15 @@
"the portlet. After entering your user name you will receive an e-mail with "
"your new login credentials."
msgstr ""
+"登録済みのユーザーは portlet のナビゲーションにある <emphasis role=\"bold\">Lost password</emphasis> "
+"リンクをクリックすると、新規のパスワードを申請することができます。ユーザー名を入力した後に、 "
+"ユーザーの新しい信任状を持つ電子メールが送信されます。"
#. Tag: emphasis
#: JBoss_Portal_Basics.xml:410
#, no-c-format
msgid "View profile"
-msgstr ""
+msgstr "プロフィールの表示"
#. Tag: para
#: JBoss_Portal_Basics.xml:412
@@ -432,12 +538,14 @@
"The default page after login is the view profile page. This page displays a "
"summary of the most important properties of a user."
msgstr ""
+"ログイン後のデフォルトページはプロフィール表示のページです。このページは "
+"ユーザーの最も重要な事項の要約を表示します。"
#. Tag: emphasis
#: JBoss_Portal_Basics.xml:418
#, no-c-format
msgid "Edit personal information"
-msgstr ""
+msgstr "個人情報の編集"
#. Tag: para
#: JBoss_Portal_Basics.xml:420
@@ -447,12 +555,15 @@
"password and e-mail address at any time by clicking on the <emphasis role="
"\"bold\">Edit profile</emphasis> link, when logged in."
msgstr ""
+"ユーザーはログイン時に <emphasis role=\"bold\">Edit profile</emphasis> リンクをクリックして "
+"その個人情報の編集や、パスワードの変更、及び電子メールアドレスの変更などを実行する能力を与えられて "
+"います。"
#. Tag: title
#: JBoss_Portal_Basics.xml:430
#, no-c-format
msgid "CMS Portlet"
-msgstr ""
+msgstr "CMS Portlet"
#. Tag: para
#: JBoss_Portal_Basics.xml:437
@@ -461,6 +572,9 @@
"Portal includes a basic Content Management System (CMS) portlet which allows "
"users to navigate the CMS content (static html, images, binary files, etc.)."
msgstr ""
+"Portal には、ユーザーが CMS コンテンツ （静的 html、イメージ、バイナリファイル等）を "
+"ナビゲートできるようにする基本的な Content Management System (CMS) portlet が "
+"含まれています。"
#. Tag: para
#: JBoss_Portal_Basics.xml:443
@@ -501,7 +615,7 @@
#: JBoss_Portal_Basics.xml:469
#, no-c-format
msgid "News Page"
-msgstr ""
+msgstr "News Page"
#. Tag: para
#: JBoss_Portal_Basics.xml:471
@@ -516,7 +630,7 @@
#: JBoss_Portal_Basics.xml:484
#, no-c-format
msgid "News Portlet"
-msgstr ""
+msgstr "News Portlet"
#. Tag: para
#: JBoss_Portal_Basics.xml:485
@@ -542,13 +656,13 @@
#: JBoss_Portal_Basics.xml:513
#, no-c-format
msgid "This portlet is capable of handling most RSS 1.0 and RSS 2.0 feeds."
-msgstr ""
+msgstr "この portlet は殆どの RSS 1.0 と RSS 2.0 フィードを処理する能力を持っています。"
#. Tag: title
#: JBoss_Portal_Basics.xml:522
#, no-c-format
msgid "Weather Page"
-msgstr ""
+msgstr "Weather Page"
#. Tag: para
#: JBoss_Portal_Basics.xml:524
@@ -566,7 +680,7 @@
#: JBoss_Portal_Basics.xml:533
#, no-c-format
msgid "Weather Portlet"
-msgstr ""
+msgstr "Weather Portlet"
#. Tag: para
#: JBoss_Portal_Basics.xml:535
@@ -575,6 +689,8 @@
"The Weather Portlet retrieves an RSS weather feed, based on a key (commonly "
"a US Postal Code), and displays it as HTML to the user."
msgstr ""
+"Weather Portlet は、キー（一般的に US 郵便番号）を基にして RSS 天候フィードを取り込み、 "
+"それを HTML としてユーザーに表示します。"
#. Tag: para
#: JBoss_Portal_Basics.xml:547
@@ -604,12 +720,14 @@
"Go to <ulink url=\"http://weather.yahoo.com/\">http://weather.yahoo.com/</"
"ulink>"
msgstr ""
+"<ulink url=\"http://weather.yahoo.com/\">http://weather.yahoo.com/</"
+"ulink> を開きます。"
#. Tag: para
#: JBoss_Portal_Basics.xml:576
#, no-c-format
msgid "Enter your city name in the location field:"
-msgstr ""
+msgstr "ロケーションフィールドに地元の市の名前を入力します:"
#. Tag: para
#: JBoss_Portal_Basics.xml:587
@@ -619,6 +737,8 @@
"Results</emphasis> and click on it (<emphasis>Marseille, France</emphasis>, "
"in this case):"
msgstr ""
+"<emphasis role=\"bold\">Search Results（検出結果）</emphasis> の中のリストから "
+"地元の位置を見つけて、それをクリックします（例では、<emphasis>Marseille, France</emphasis>）:"
#. Tag: para
#: JBoss_Portal_Basics.xml:600
@@ -627,6 +747,8 @@
"Copy the location digits from the address bar in your browser "
"(<emphasis>FRXX0059</emphasis> in this case):"
msgstr ""
+"ブラウザ内のアドレスバーからロケーション番号をコピーします（例では、 "
+"<emphasis>FRXX0059</emphasis>）:"
#. Tag: para
#: JBoss_Portal_Basics.xml:613
@@ -643,7 +765,7 @@
#: JBoss_Portal_Basics.xml:640
#, no-c-format
msgid "Personal Dashboard"
-msgstr ""
+msgstr "個人用 Dashboard"
#. Tag: para
#: JBoss_Portal_Basics.xml:642
@@ -677,7 +799,7 @@
#: JBoss_Portal_Basics.xml:671
#, no-c-format
msgid "Configuring your personal dashboard"
-msgstr ""
+msgstr "個人用 dashboard の設定"
#. Tag: para
#: JBoss_Portal_Basics.xml:673
@@ -691,7 +813,7 @@
#: JBoss_Portal_Basics.xml:685
#, no-c-format
msgid "Dashboard-wide operations"
-msgstr ""
+msgstr "Dashboard 全域の操作"
#. Tag: para
#: JBoss_Portal_Basics.xml:687
@@ -730,13 +852,13 @@
#: JBoss_Portal_Basics.xml:721
#, no-c-format
msgid "Deleted pages are NOT recoverable. This change is permanent!"
-msgstr ""
+msgstr "削除したページは復元できません。この変更は不変になります。"
#. Tag: title
#: JBoss_Portal_Basics.xml:730
#, no-c-format
msgid "Managing Portlets on a page"
-msgstr ""
+msgstr "ページ上で Portlets の管理"
#. Tag: para
#: JBoss_Portal_Basics.xml:732
@@ -753,7 +875,7 @@
#: JBoss_Portal_Basics.xml:748
#, no-c-format
msgid "Admin Portal"
-msgstr ""
+msgstr "Admin Portal"
#. Tag: para
#: JBoss_Portal_Basics.xml:751
@@ -769,13 +891,13 @@
#: JBoss_Portal_Basics.xml:758
#, no-c-format
msgid "Users/Roles (See:"
-msgstr ""
+msgstr "ユーザー/ロール （以下を参照）:"
#. Tag: para
#: JBoss_Portal_Basics.xml:762
#, no-c-format
msgid "Content Management System (See:"
-msgstr ""
+msgstr "Content Management System（以下を参照）:"
#. Tag: para
#: JBoss_Portal_Basics.xml:763
@@ -793,3 +915,4 @@
"guide/en/html/wsrp.html\">WSRP chapter</ulink> in the Reference Guide for "
"more information)"
msgstr ""
+
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13777 - docs/enterprise/trunk/User_Guide/ja-JP.
by portal-commits＠lists.jboss.org
Author: khashida(a)redhat.com
Date: 2009-08-18 04:56:09 -0400 (Tue, 18 Aug 2009)
New Revision: 13777
Modified:
docs/enterprise/trunk/User_Guide/ja-JP/Administration_CMS_Portlet.po
Log:
finished one file
Modified: docs/enterprise/trunk/User_Guide/ja-JP/Administration_CMS_Portlet.po
===================================================================
--- docs/enterprise/trunk/User_Guide/ja-JP/Administration_CMS_Portlet.po 2009-08-18 05:11:49 UTC (rev 13776)
+++ docs/enterprise/trunk/User_Guide/ja-JP/Administration_CMS_Portlet.po 2009-08-18 08:56:09 UTC (rev 13777)
@@ -1,35 +1,38 @@
+# translation of Administration_CMS_Portlet.po to Japanese
# Language ja-JP translations for User_Guide package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: User_Guide VERSION\n"
+"Project-Id-Version: Administration_CMS_Portlet\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:58+0000\n"
-"PO-Revision-Date: 2009-08-14 00:58+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-18 17:50+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Administration_CMS_Portlet.xml:6
#, no-c-format
msgid "Administration Content Management System (CMS) Portlet"
-msgstr ""
+msgstr "管理コンテンツマネージメントシステム (CMSAdmin) Portlet"
#. Tag: title
#: Administration_CMS_Portlet.xml:11
#, no-c-format
msgid "Introduction"
-msgstr ""
+msgstr "はじめに"
#. Tag: para
#: Administration_CMS_Portlet.xml:14
#, no-c-format
msgid "The CMSAdmin Portlet allows control over the content management system."
-msgstr ""
+msgstr "CMSAdmin Portlet の使用でコンテンツマネージメントシステムが制御できます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:18
@@ -38,18 +41,20 @@
"Viewing the CMSAdmin Portlet is accomplished by logging in as admin (admin/"
"admin) and navigating to the admin portal and then the CMS Page tab."
msgstr ""
+"CMSAdmin Portlet を表示するには、admin としてログインして (admin/admin)、 "
+"admin portal まで移動し、それから CMS Page タブへと進みます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:22
#, no-c-format
msgid "You will then be presented with a page that is similar to this:"
-msgstr ""
+msgstr "そうすると、以下に似たページが表示されることになります:"
#. Tag: title
#: Administration_CMS_Portlet.xml:34
#, no-c-format
msgid "Actions"
-msgstr ""
+msgstr "アクション"
#. Tag: para
#: Administration_CMS_Portlet.xml:37
@@ -60,12 +65,16 @@
"menu. Note that the Pending Items action is only available if the workflow "
"mechanism has been activated."
msgstr ""
+"このセクションでは、管理者が AdminCMS Portlet 内から実行できる一般的なアクションを "
+"説明しています。全てのアクションは flyout メニューを使用して得ることができます。 "
+"Pending Items（保留項目）アクションは、ワークフローメカニズムがアクティベートされている "
+"場合にのみ利用できることに注意して下さい。"
#. Tag: title
#: Administration_CMS_Portlet.xml:52
#, no-c-format
msgid "Viewing Directories"
-msgstr ""
+msgstr "ディレクトリの表示"
#. Tag: para
#: Administration_CMS_Portlet.xml:58
@@ -74,18 +83,22 @@
"A user can list directory contents by either clicking on the folder name or "
"selecting \"view\" from the Action dropdown and clicking \"go\"."
msgstr ""
+"ユーザーがディレクトリの内容を一覧表示するには、フォルダー名をクリックするか、又は "
+"Action のドロップダウンから \"view\" （表示）を選択して、\"go\" （移動）をクリックします。"
#. Tag: title
#: Administration_CMS_Portlet.xml:68
#, no-c-format
msgid "Viewing File Properties"
-msgstr ""
+msgstr "ファイルプロパティの表示"
#. Tag: para
#: Administration_CMS_Portlet.xml:74
#, no-c-format
msgid "Clicking on the \"Name\" of a file brings up the File Properties page."
msgstr ""
+"ファイルの \"Name\"（名前）をクリックすると、ファイルのプロパティページが "
+"表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:83
@@ -94,6 +107,8 @@
"The File Properties window displays all the possible actions available to "
"perform on a file."
msgstr ""
+"ファイルプロパティのウィンドウはそのファイル上で実行可能な全てのあり得るアクションを "
+"表示します。"
#. Tag: para
#: Administration_CMS_Portlet.xml:87
@@ -104,12 +119,15 @@
"\"images/admincms/live.png\" format=\"PNG\"/> </imageobject> </mediaobject> "
"is the current \"live\" version shown to users."
msgstr ""
+"バージョンとロケールの情報もこの画面に含まれています。<mediaobject> <imageobject> <imagedata fileref="
+"\"images/admincms/live.png\" format=\"PNG\"/> </imageobject> </mediaobject> のラベルが付いたバージョンは "
+"全て、ユーザーに示される現在のライブバージョンです。"
#. Tag: title
#: Administration_CMS_Portlet.xml:103
#, no-c-format
msgid "Copying Files/Directories"
-msgstr ""
+msgstr "ファイル/ディレクトリの複製（コピー）"
#. Tag: para
#: Administration_CMS_Portlet.xml:105
@@ -118,6 +136,8 @@
"Clicking on the \"Copy\" action, displays the copy file/directory dialog "
"window."
msgstr ""
+"\"Copy\"（複製）アクションをクリックすると、「ファイル/ディレクトリの複製」ダイアログ "
+"ウィンドウが表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:114
@@ -132,12 +152,20 @@
"name of the directory within the tree sets it as the destination directory "
"for the copied resource."
msgstr ""
+"「リソースの複製」ウィンドウの使用により、ユーザーはファイルをシステム上の "
+"どのフォルダにでも複製することが出来て、更にディレクトリツリー全体をシステム上の "
+"どのディレクトリにも複製することができます。ユーザーはディレクトリ閲覧を使用することで "
+"どの複製先ディレクトリにリソースを複製するかを選択できます。<mediaobject> <imageobject> "
+"<imagedata fileref=\"images/admincms/plus.png\" format=\"PNG\"/> </"
+"imageobject> </mediaobject> アイコンをクリックすると、ディレクトリツリーが展開します。 "
+"そのツリー内のディレクトリ名をクリックすると、それが複製するリソースの複製先ディレクトリとして "
+"セットされます。"
#. Tag: title
#: Administration_CMS_Portlet.xml:131
#, no-c-format
msgid "Moving Files/Directories"
-msgstr ""
+msgstr "ファイル/ディレクトリの移動"
#. Tag: para
#: Administration_CMS_Portlet.xml:134
@@ -146,6 +174,8 @@
"Clicking on the \"Move\" action, displays the move file/directory dialog "
"window."
msgstr ""
+"\"Move\"（移動）アクションをクリックすると、「ファイル/ディレクトリの移動」ダイアログ "
+"ウィンドウが表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:144
@@ -160,12 +190,20 @@
"name of the directory within the tree sets it as the destination directory "
"for the moved resource."
msgstr ""
+"「リソースの移動」ウィンドウの使用により、ユーザーはファイルをシステム上のどの "
+"フォルダにも移動することができて、更にはディレクトリツリー全体もシステム上のどの "
+"ディレクトリにでも移動することができます。ユーザーはディレクトリ閲覧を使用することで "
+"どの移動先ディレクトリにリソースを移動するかを選択できます。<mediaobject> <imageobject> "
+"<imagedata fileref=\"images/admincms/plus.png\" format=\"PNG\"/> </"
+"imageobject> </mediaobject> アイコンをクリックするとディレクトリツリーが展開します。 "
+"そのツリー内のディレクトリ名をクリックすると、それが移動リソースの為の移動先ディレクトリに "
+"セットされます。"
#. Tag: title
#: Administration_CMS_Portlet.xml:160
#, no-c-format
msgid "Deleting Files/Directories"
-msgstr ""
+msgstr "ファイル/ディレクトリの削除"
#. Tag: para
#: Administration_CMS_Portlet.xml:163
@@ -174,6 +212,8 @@
"Clicking on the \"Delete\" action, displays the delete file/directory "
"confirmation window."
msgstr ""
+"\"Delete\" （削除）アクションをクリックすると、「ファイル/ディレクトリの削除」の確認 "
+"ウィンドウが表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:173
@@ -183,6 +223,10 @@
"directory on the system. Note that deleting a directory will delete the "
"entire tree, so all directories under the deleted one will also be deleted."
msgstr ""
+"「リソース削除の確認」ウィンドウの使用により、ユーザーはシステム上のファイルや "
+"ディレクトリを削除できます。ディレクトリの削除はそのツリー全体を削除することに "
+"注意して下さい。そのため、削除されたディレクトリ下に存在した全てのディレクトリも "
+"削除されてしまいます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:179
@@ -191,12 +235,14 @@
"Currently, there is no way to retrieve deleted files/directories! Deleting a "
"file or directory is permanent!"
msgstr ""
+"現在、削除されたファイル/ディレクトリを取り戻す方法はありません。ファイルや "
+"ディレクトリの削除は完全消滅を意味します。"
#. Tag: title
#: Administration_CMS_Portlet.xml:187
#, no-c-format
msgid "Creating Directories"
-msgstr ""
+msgstr "ディレクトリの作成"
#. Tag: para
#: Administration_CMS_Portlet.xml:189
@@ -205,6 +251,8 @@
"Clicking on the \"Create Folder\" action, displays the create directory "
"dialog window."
msgstr ""
+"\"Create Folder\"（フォルダの作成）アクションをクリックすると、「ディレクトリの作成」 "
+"のダイアログウィンドウが表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:198
@@ -214,12 +262,15 @@
"under chosen path. On this window, a user can specify a name for the new "
"empty directory and assign it a description."
msgstr ""
+"「ディレクトリリソースの作成」ウィンドウの使用により、ユーザーは選択したパス内に "
+"ディレクトリを作成できます。このウィンドウでユーザーは新規の空ディレクトリの名前を "
+"指定することができ、それに説明を割り当てることができます。"
#. Tag: title
#: Administration_CMS_Portlet.xml:205
#, no-c-format
msgid "Creating Text/HTML Files"
-msgstr ""
+msgstr "テキスト/HTML ファイルの作成"
#. Tag: para
#: Administration_CMS_Portlet.xml:207
@@ -228,6 +279,9 @@
"Clicking on the \"Create File\" action, displays the create file dialog "
"window with the embedded WYSIWYG editor and directory browser."
msgstr ""
+"\"Create File\"（ファイルの作成）アクションをクリックすると、「ファイルの作成」の "
+"ダイアログウィンドウが組み込み型の WYSIWYG エディタとディレクトリブラウザと共に "
+"表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:217
@@ -241,6 +295,14 @@
"<mediaobject> <imageobject> <imagedata fileref=\"images/admincms/"
"editorsource.png\" format=\"PNG\"/> </imageobject> </mediaobject> button."
msgstr ""
+"「ファイルの作成」ウィンドウの使用により、ユーザーは組み込み型の WYSIWYG HTML "
+"エディタを使ってテキスト、又は HTML のファイルを作成することができます。このエディタは "
+"HTML 機能を多数持つ全機能型 HTML エディタです。これにはまた、<mediaobject> "
+"<imageobject> <imagedata fileref=\"images/admincms/editorpreview.png\" "
+"format=\"PNG\"/> </imageobject> </mediaobject> button and a source view "
+"<mediaobject> <imageobject> <imagedata fileref=\"images/admincms/"
+"editorsource.png\" format=\"PNG\"/> </imageobject> </mediaobject> のプレビュー "
+"ボタンも含まれています。"
#. Tag: para
#: Administration_CMS_Portlet.xml:237
@@ -252,6 +314,10 @@
"admincms/editorhelp.png\" format=\"PNG\"/> </imageobject> </mediaobject> "
"icon."
msgstr ""
+"このエディタに関する詳細説明はこのドキュメントの管轄範囲を越えるものです。 "
+"しかし、このエディタはその中にヘルプページを含んでおり、<mediaobject> <imageobject> <imagedata fileref=\"images/"
+"admincms/editorhelp.png\" format=\"PNG\"/> </imageobject> </mediaobject> アイコンをクリックすることで "
+"そのヘルプにアクセスができますのでご覧下さい。"
#. Tag: para
#: Administration_CMS_Portlet.xml:249
@@ -262,6 +328,11 @@
"resource. ie: images/hello.i.e.,. Keep in mind at all times that the "
"document base is http://localhost/portal/ by default!"
msgstr ""
+"ここで重要なことは、システム内でイメージに対して、又は他のリソースに "
+"対してリンクを作成している時、ユーザーはそのリソースに対して相対パスを "
+"使用しなければならないことです。すなわち、 images/hello.i.e などとします。 "
+"常にこのドキュメントの基地はデフォルトで http://localhost/portal/ で "
+"あることを忘れないで下さい。"
#. Tag: para
#: Administration_CMS_Portlet.xml:253
@@ -271,12 +342,14 @@
"portlet title bar, and a language for the file, used in serving localized "
"content."
msgstr ""
+"更に、ユーザーは Portlet のタイトルバー内で使用されるファイル用のタイトルと、 "
+"ローカル化したコンテンツへのサービスに使用するファイルの言語もセットできます。 "
#. Tag: title
#: Administration_CMS_Portlet.xml:260
#, no-c-format
msgid "Uploading Files"
-msgstr ""
+msgstr "ファイルのアップロード"
#. Tag: para
#: Administration_CMS_Portlet.xml:262
@@ -285,6 +358,8 @@
"Clicking on the \"Upload File\" action, displays the upload file dialog "
"window."
msgstr ""
+"\"Upload File\"（ファイルのアップロード）アクションをクリックすると、 "
+"「ファイルのアップロード」ダイアログウィンドウが表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:272
@@ -301,12 +376,23 @@
"that will be used in the portlet title bar, and a language for the file, "
"used in serving localized content."
msgstr ""
+"「ファイルのアップロード」ウィンドウの使用により、ユーザーはファイルを "
+"システム内のどのディレクトリにでもアップロードできます。このアップロード "
+"プロセスは全てのファイルタイプに於いて最大 1GB までのファイルに有効です。 "
+"ユーザーは、ディレクトリ閲覧を使用して、どのアップロード先ディレクトリに "
+"リソースをアップロードするかを選択できます。<mediaobject> <imageobject> "
+"<imagedata fileref=\"images/admincms/plus.png\" format=\"PNG\"/> </"
+"imageobject> </mediaobject> アイコンをクリックすると、ディレクトリツリーが "
+"展開します。そのツリー内のディレクトリ名をクリックすると、それがリソースの "
+"アップロード先のディレクトリとしてセットされます。更には、ユーザーは Portlet タイトルバー "
+"内で使用されるファイル用のタイトルと、ローカル化したコンテンツへのサービスに使用する "
+"ファイルの言語をセットすることができます。"
#. Tag: title
#: Administration_CMS_Portlet.xml:287
#, no-c-format
msgid "Uploading Archives"
-msgstr ""
+msgstr "アーカイブのアップロード"
#. Tag: para
#: Administration_CMS_Portlet.xml:289
@@ -315,6 +401,8 @@
"Clicking on the \"Upload Archive\" action, displays the upload archive "
"dialog window."
msgstr ""
+"\"Upload Archive\"（アーカイブのアップロード）アクションにチェックを入れると、アーカイブアップロード用の "
+"ダイアログウィンドウが表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:299
@@ -331,12 +419,21 @@
"resource. Additionally, a user can set a language for the archive files, "
"used in serving localized content."
msgstr ""
+"「アーカイブのアップロード」ウィンドウの使用により、ユーザーはアーカイブを "
+"システム上のどのディレクトリにもアップロードできます。システムはその後、アーカイブを "
+"展開してバージョンを作成し、全てのファイルをレポジトリに配置します。ユーザーは "
+"ディレクトリ閲覧を使用して、どのアップロード先ディレクトリにリソースをアップロードするかを "
+"選択できます。<mediaobject> <imageobject> <imagedata fileref="
+"\"images/admincms/plus.png\" format=\"PNG\"/> </imageobject> </mediaobject> アイコンを "
+"クリックすると、ディレクトリツリーが展開します。そのツリー内のディレクトリ名をクリックすると、 "
+"それがリソースのアップロード先ディレクトリとしてセットされます。更には、ユーザーはローカル化した "
+"コンテンツへのサービスに使用するアーカイブファイル用の言語をセットすることができます。"
#. Tag: title
#: Administration_CMS_Portlet.xml:315
#, no-c-format
msgid "Exporting Folders"
-msgstr ""
+msgstr "フォルダのエキスポート"
#. Tag: para
#: Administration_CMS_Portlet.xml:318
@@ -345,6 +442,8 @@
"Clicking on the \"Export Folder\" action, displays the export archive dialog "
"window."
msgstr ""
+"\"Export Folder\" （フォルダのエキスポート）アクションをクリックすると、「アーカイブのエキスポート」 "
+"ダイアログウィンドウが表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:328
@@ -360,6 +459,15 @@
"within the tree, sets it as the source directory for the export resource. "
"Additionally, a user can set a language for the files to be exported."
msgstr ""
+"「フォルダのエキスポート」ウィンドウの使用により、ユーザーはディレクトリ構成 "
+"全体を zip ファイルとしてエキスポートすることができます。システムは特定ディレクトリの "
+"全てのコンテンツを集約して、ユーザーのダウンロード用に提供します。ユーザーはディレクトリ "
+"閲覧を使用して、どのエキスポート元ディレクトリからリソースをエキスポートするかを選択できます。 "
+"<mediaobject> <imageobject> <imagedata fileref="
+"\"images/admincms/plus.png\" format=\"PNG\"/> </imageobject> </mediaobject> アイコンを "
+"クリックするとディレクトリツリーが展開します。そのツリー内のディレクトリ名をクリックすると "
+"それがリソースのエキスポート元ディレクトリとしてセットされます。更には、ユーザーはエキスポート "
+"されるファイル用の言語をセットすることができます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:342
@@ -368,12 +476,14 @@
"Version information is not exported. Only versions labeled \"Live\" are "
"exported!"
msgstr ""
+"バージョン情報はエキスポートされません。\"Live\" のラベルの付いたバージョンのみが "
+"エキスポートされます。"
#. Tag: title
#: Administration_CMS_Portlet.xml:351
#, no-c-format
msgid "Editing Text/HTML Files"
-msgstr ""
+msgstr "テキスト/HTML ファイルの編集"
#. Tag: para
#: Administration_CMS_Portlet.xml:357
@@ -382,6 +492,8 @@
"Clicking on the \"text/html\"link, displays the edit file dialog window with "
"the embedded WYSIWYG editor and directory browser."
msgstr ""
+"\"text/html\" リンクをクリックすると、「ファイルの編集」ダイアログウィンドウが "
+"組込み型 WYSIWYG エディタとディレクトリブラウザと共に表示されます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:369
@@ -395,6 +507,14 @@
"<mediaobject> <imageobject> <imagedata fileref=\"images/admincms/"
"editorsource.png\" format=\"PNG\"/> </imageobject> </mediaobject> button."
msgstr ""
+"「ファイルの編集」ウィンドウの使用により、ユーザーは組み込み型 WYSIWYG HTML エディタを "
+"使ってテキスト、又は HTML ファイルを編集できます。このエディタは HTML 機能を数多く持った "
+"全機能型 HTML エディタです。これはまた、<mediaobject> "
+"<imageobject> <imagedata fileref=\"images/admincms/editorpreview.png\" "
+"format=\"PNG\"/> </imageobject> </mediaobject> プレビューボタンと "
+"<mediaobject> <imageobject> <imagedata fileref=\"images/admincms/"
+"editorsource.png\" format=\"PNG\"/> </imageobject> </mediaobject> ソースビューボタンも "
+"含んでいます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:390
@@ -404,12 +524,15 @@
"\", or available in production. Additionally, a user can set a title for the "
"file that will be used as the portlet window title."
msgstr ""
+"ユーザーはこの時点で、新規の編集を \"live\" にするか、又は実稼働用に利用可能に "
+"するかを指定できます。更には、ユーザーは Portlet ウィンドウのタイトルとして "
+"使用されるファイル用のタイトルをセットすることができます。"
#. Tag: title
#: Administration_CMS_Portlet.xml:397
#, no-c-format
msgid "Securing Resources"
-msgstr ""
+msgstr "リソースの保護"
#. Tag: para
#: Administration_CMS_Portlet.xml:399
@@ -419,6 +542,9 @@
"in the CMS. These permissions on a specific node, can be applied on a per-"
"Role and/or per-User basis."
msgstr ""
+"管理者は、CMS 内のどのフォルダやファイルに対しても権限設定を適用することが "
+"できます。特定ノード上のこれらの権限はロール毎、又はユーザー毎のベースで適用 "
+"できます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:403
@@ -427,6 +553,8 @@
"The security dialogue is accessed by navigating to the node you want to "
"secure and selecting <emphasis>Secure</emphasis> ."
msgstr ""
+"「セキュリティ」ダイアログは、保護したいノードに移動して <emphasis>Secure</emphasis> を "
+"選択することによりアクセスできます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:412
@@ -448,12 +576,24 @@
"as simple as selecting which Roles and/or Users you want to allow to have a "
"specific permission."
msgstr ""
+"そうすると、選ばれたロール、又は特定のユーザーへ読み込み、書き込み、及び管理の特権を "
+"許可する画面が提示されます。<mediaobject> <imageobject> <imagedata fileref=\"images/"
+"admincms/secure_node.png\" format=\"PNG\"/> </imageobject> </mediaobject> "
+"CMS には、全てのノードに対し３つの主要セキュリティ設定があります。 "
+"<itemizedlist> <listitem> <para><emphasis role=\"bold\">Read Permissions（読み込み権限）:</"
+"emphasis> 割り当てされたロール/ユーザーはリソースを表示できます。</para> </listitem> "
+"<listitem> <para> <emphasis role=\"bold\">Write Permissions（書き込み権限）:</emphasis> "
+"割り当てされたロール/ユーザーはリソースを編集、又はノードの作成ができます（フォルダと同様） "
+"</para> </listitem> <listitem> <para> "
+"<emphasis role=\"bold\">Manage Permissions（管理権限）:</emphasis> この権限には "
+"複製、移動、削除、及びエキスポートが含まれます。</para> </listitem> </"
+"itemizedlist>"
#. Tag: title
#: Administration_CMS_Portlet.xml:444
#, no-c-format
msgid "Content Publish/Approval Workflow"
-msgstr ""
+msgstr "コンテンツの発行/認可ワークフロー"
#. Tag: para
#: Administration_CMS_Portlet.xml:446
@@ -465,6 +605,11 @@
"of Portal Roles that can act as Approvers who can authorize/deny the "
"publishing of content in the CMS."
msgstr ""
+"発行/認可ワークフローサービスが CMS 上でアクティベートされている時は、新規 "
+"コンテンツの発行、又は既存コンテンツの更新に対する要求はいずれも、\"Live\" に "
+"なる前に Approval のプロセスを必要とします。Approvers（認可者）として行動 "
+"できる Portal ロールのリストを指定できます。この Approvers が CMS 内のコンテンツの "
+"発行を承認/否定できます。"
#. Tag: para
#: Administration_CMS_Portlet.xml:449
@@ -474,6 +619,9 @@
"Queue of Approvals for that particular content as shown below in the screen. "
"The content waiting in this queue is not accessible for \"Live\" usage."
msgstr ""
+"コンテンツが CMS 内で作成されると、その特定のコンテンツ用の Pending Queue of Approvals "
+"（認可の保留キュー）の画面が表示されます。このキュー内で待っているコンテンツは "
+"\"Live\" 使用にはアクセスできません。"
#. Tag: para
#: Administration_CMS_Portlet.xml:458
@@ -483,3 +631,7 @@
"clicking the <emphasis role=\"bold\">Pending Items</emphasis> link in the "
"flyout menu. The Pending Queue screen is as follows:"
msgstr ""
+"Approvers として任命を受けたユーザーは、flyout メニュー内の <emphasis role=\"bold\">Pending Items（保留項目）</emphasis> "
+"リンクをクリックすることで、CMS の保留キューを表示することができます。この保留キュー画面は以下のように "
+"なります:"
+
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13776 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: mposolda(a)redhat.com
Date: 2009-08-18 01:11:49 -0400 (Tue, 18 Aug 2009)
New Revision: 13776
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
Log:
Fix test failures.
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-08-18 04:11:17 UTC (rev 13775)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-08-18 05:11:49 UTC (rev 13776)
@@ -287,7 +287,7 @@
</target>
- <target name="single-test-without-dependencies" depends="run-src">
+ <target name="single-test-without-dependencies">
<echo message="Runing TestNG" />
<!--<mkdir dir="test-output" />
@@ -304,10 +304,7 @@
<sysproperty key="html-src" value="${html-src}" />
<sysproperty key="output-dir" value="${testng.output.dir}" />
<jvmarg value="-ea" />
- </testng>
-
- <antcall target="cleanup" />
-
+ </testng>
</target>
<target name="selenium-test" depends="init, compile, run-src, copyApps, create-test-files">
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13775 - jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-08-18 00:11:17 -0400 (Tue, 18 Aug 2009)
New Revision: 13775
Modified:
jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java
Log:
Enable the federating portlet invoker as the portlet invoker service used in the portal.
Modified: jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java
===================================================================
--- jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-08-18 03:49:09 UTC (rev 13774)
+++ jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-08-18 04:11:17 UTC (rev 13775)
@@ -135,7 +135,7 @@
// register local portlet invoker with federating portlet invoker
federatingPortletInvoker.registerInvoker(FederatingPortletInvoker.LOCAL_PORTLET_INVOKER_ID, consumerPortletInvoker);
/* register with container */
- container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); //federatingPortletInvoker);
+ container.registerComponentInstance(PortletInvoker.class, federatingPortletInvoker);//consumerPortletInvoker); //federatingPortletInvoker);
portletApplicationRegistry.start();
}
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13774 - in jbossexo/modules/portlet/trunk: api/src/main/java/org/jboss/portal/portlet/api/spi and 21 other directories.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2009-08-17 23:49:09 -0400 (Mon, 17 Aug 2009)
New Revision: 13774
Added:
jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletStateType.java
jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ExoKernelIntegration.java
Modified:
jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletContext.java
jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StatefulPortletContext.java
jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java
jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java
jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletResourceBundleFactory.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/StateConverter.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPersistenceManager.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerState.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerStateContext.java
jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java
jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java
jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java
jbossexo/modules/portlet/trunk/test/pom.xml
jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java
jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java
jbossexo/modules/portlet/trunk/test/src/test/build.xml
jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
Log:
Update tests to get them mostly working again.
Apply Julien's patch to create a separate StatefulPortletContext which contains a serializable class as its state instead of using a byte array. This will allow using portlet specific preference classes without having to rely on costly byte array transformations.
Modified: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletContext.java
===================================================================
--- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletContext.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletContext.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -74,11 +74,6 @@
return "PortletContext[" + id + "]";
}
- public byte[] getState()
- {
- return null;
- }
-
/**
* Create a PortletContext based on id and optional state.
*
@@ -86,11 +81,12 @@
* @param state the optional state
* @return a new PortletContext based on the provided information
*/
+ @Deprecated()
public static PortletContext createPortletContext(String id, byte[] state)
{
if (state != null && state.length > 0)
{
- return new StatefulPortletContext(id, state);
+ return new StatefulPortletContext<byte[]>(id, PortletStateType.OPAQUE, state);
}
else
{
@@ -107,9 +103,10 @@
* @param state the mandatory state
* @return a new PortletContext
*/
- public static PortletContext createStatefulPortletContext(String id, byte[] state)
+ @Deprecated
+ public static StatefulPortletContext<byte[]> createStatefulPortletContext(String id, byte[] state)
{
- return new StatefulPortletContext(id, state);
+ return new StatefulPortletContext<byte[]>(id, PortletStateType.OPAQUE, state);
}
public static PortletContext createPortletContext(String portletId)
Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletStateType.java
===================================================================
--- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletStateType.java (rev 0)
+++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletStateType.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2003-2007 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.jboss.portal.portlet.api;
+
+import java.io.Serializable;
+import java.util.Arrays;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public abstract class PortletStateType<S extends Serializable>
+{
+
+ public static final PortletStateType<byte[]> OPAQUE = new PortletStateType<byte[]>()
+ {
+ public Class<byte[]> getJavaType() {
+ return byte[].class;
+ }
+
+ @Override
+ public boolean equals(byte[] state1, byte[] state2) {
+ return Arrays.equals(state1, state2);
+ }
+
+ @Override
+ public int hashCode(byte[] state) {
+ return (state != null ? state.hashCode() : 0);
+ }
+
+ @Override
+ public String toString(byte[] state) {
+ return "" + state.length;
+ }
+ };
+
+ public abstract Class<S> getJavaType();
+
+ public abstract boolean equals(S state1, S state2);
+
+ public abstract int hashCode(S state);
+
+ public abstract String toString(S state);
+
+}
Modified: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StatefulPortletContext.java
===================================================================
--- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StatefulPortletContext.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StatefulPortletContext.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -24,7 +24,7 @@
import org.jboss.portal.common.util.ParameterValidation;
-import java.util.Arrays;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -32,21 +32,44 @@
* @version $Revision: 1.1 $
* @since 2.6
*/
-public class StatefulPortletContext extends PortletContext
+public class StatefulPortletContext<S extends Serializable> extends PortletContext
{
+ public static <S extends Serializable> StatefulPortletContext<S> create(String id, StatefulPortletContext<S> spc)
+ {
+ return new StatefulPortletContext<S>(id, spc.type, spc.state);
+ }
+
+ public static <S extends Serializable> StatefulPortletContext<S> create(
+ String id,
+ PortletStateType<S> type,
+ S state)
+ {
+ return new StatefulPortletContext<S>(id, type, state);
+ }
+
/** . */
- private final byte[] marshalledState;
+ private final S state;
- StatefulPortletContext(String id, byte[] marshalledState) throws IllegalArgumentException
+ /** . */
+ private final PortletStateType<S> type;
+
+ StatefulPortletContext(String id, PortletStateType<S> type, S state) throws IllegalArgumentException
{
super(id);
- ParameterValidation.throwIllegalArgExceptionIfNull(marshalledState, "Portlet state");
+ //
+ ParameterValidation.throwIllegalArgExceptionIfNull(type, "Portlet type");
+ ParameterValidation.throwIllegalArgExceptionIfNull(state, "Portlet state");
- this.marshalledState = marshalledState;
+ //
+ this.type = type;
+ this.state = state;
}
+ public PortletStateType<S> getType() {
+ return type;
+ }
public boolean equals(Object o)
{
@@ -63,25 +86,34 @@
return false;
}
- StatefulPortletContext that = (StatefulPortletContext)o;
+ //
+ StatefulPortletContext<?> that = (StatefulPortletContext<?>)o;
- return Arrays.equals(marshalledState, that.marshalledState);
+ //
+ if (type.getJavaType().equals(that.type.getJavaType()))
+ {
+ S thatState = type.getJavaType().cast(that.getState());
+ return type.equals(state, thatState);
+ }
+
+ //
+ return false;
}
public int hashCode()
{
int result = super.hashCode();
- result = 31 * result + (marshalledState != null ? marshalledState.hashCode() : 0);
+ result = 31 * result + (state != null ? state.hashCode() : 0);
return result;
}
- public byte[] getState()
+ public S getState()
{
- return marshalledState;
+ return state;
}
public String toString()
{
- return "StatefulPortletContext[" + id + "," + marshalledState.length + "]";
+ return "StatefulPortletContext[" + id + "," + type.toString(state) + "]";
}
}
Modified: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java
===================================================================
--- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -23,8 +23,11 @@
package org.jboss.portal.portlet.api.spi;
import org.jboss.portal.portlet.api.StateEvent;
+import org.jboss.portal.portlet.api.PortletStateType;
import org.jboss.portal.portlet.api.state.AccessMode;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5448 $
@@ -51,4 +54,12 @@
* @param event the event
*/
void onStateEvent(StateEvent event);
+
+ /**
+ * Returns the state type managed by the consumer. If the consumer cannot manage
+ * state by itself, then null must be returned.
+ *
+ * @return the consumer state type
+ */
+ PortletStateType<?> getStateType();
}
Modified: jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java
===================================================================
--- jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -127,17 +127,16 @@
PortletInvokerInterceptor consumerPortletInvoker = new PortletInvokerInterceptor();
consumerPortletInvoker.setNext(consumerCacheInterceptor);
- container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker);
+ //container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker);
// Federating portlet invoker
FederatingPortletInvoker federatingPortletInvoker = new FederatingPortletInvokerService();
// register local portlet invoker with federating portlet invoker
federatingPortletInvoker.registerInvoker(FederatingPortletInvoker.LOCAL_PORTLET_INVOKER_ID, consumerPortletInvoker);
-
/* register with container */
- container.registerComponentInstance(PortletInvoker.class, federatingPortletInvoker);
-
+ container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); //federatingPortletInvoker);
+
portletApplicationRegistry.start();
}
Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -30,6 +30,8 @@
import org.jboss.portal.portlet.api.StateEvent;
import org.jboss.portal.portlet.api.PortletInvoker;
import org.jboss.portal.portlet.api.PortletInvokerException;
+import org.jboss.portal.portlet.api.StatefulPortletContext;
+import org.jboss.portal.portlet.api.PortletStateType;
import org.jboss.portal.portlet.api.state.PropertyMap;
import org.jboss.portal.portlet.api.invocation.PortletInvocation;
import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse;
@@ -131,6 +133,10 @@
{
ctx.onStateEvent(new StateEvent(reference(event.getPortletContext()), event.getType()));
}
+
+ public PortletStateType<?> getStateType() {
+ return ctx.getStateType();
+ }
}
public PortletInvocationResponse invoke(PortletInvocation invocation) throws InvocationException, PortletInvokerException
@@ -215,13 +221,29 @@
private PortletContext dereference(PortletContext compoundPortletContext)
{
String portletId = compoundPortletContext.getId().substring(id.length() + 1);
- return PortletContext.createPortletContext(portletId, compoundPortletContext.getState());
+ if (compoundPortletContext instanceof StatefulPortletContext)
+ {
+ StatefulPortletContext<?> compoundStatefulPortletContext = (StatefulPortletContext<?>)compoundPortletContext;
+ return StatefulPortletContext.create(portletId, compoundStatefulPortletContext);
+ }
+ else
+ {
+ return PortletContext.createPortletContext(portletId);
+ }
}
private PortletContext reference(PortletContext portletContext)
{
String compoundPortletId = reference(portletContext.getId());
- return PortletContext.createPortletContext(compoundPortletId, portletContext.getState());
+ if (portletContext instanceof StatefulPortletContext)
+ {
+ StatefulPortletContext<?> statefulPortletContext = (StatefulPortletContext<?>)portletContext;
+ return StatefulPortletContext.create(compoundPortletId, statefulPortletContext);
+ }
+ else
+ {
+ return PortletContext.createPortletContext(compoundPortletId);
+ }
}
private String reference(String portletId)
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -33,6 +33,7 @@
import org.jboss.portal.portlet.api.StateEvent;
import org.jboss.portal.portlet.api.PortletContext;
import org.jboss.portal.portlet.api.PortletInvokerException;
+import org.jboss.portal.portlet.api.PortletStateType;
/**
* <p>This interceptor takes in charge the management of portlet customization when the invocation carries
@@ -133,5 +134,9 @@
useClone = true;
userContext.setAttribute("clone." + id, target);
}
+
+ public PortletStateType<?> getStateType() {
+ return PortletStateType.OPAQUE;
+ }
}
}
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -206,6 +206,7 @@
{
this.container = container;
this.context = PortletContext.createPortletContext(container.getPortletApplication().getId() + "." + container.getId());
+ //this.context = PortletContext.createPortletContext(container.getPortletApplication().getId().substring(1) + "/" + container.getId());
}
public PortletContext getContext()
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletResourceBundleFactory.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletResourceBundleFactory.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletResourceBundleFactory.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -129,7 +129,7 @@
}
//needed for name recursion
- MapResourceBundle mapRB = new MapResourceBundle(bundle, locale);
+ MapResourceBundle mapRB = new MapResourceBundle(bundle, bundle.getLocale());
mapRB.resolveDependencies();
//
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -25,6 +25,7 @@
import org.jboss.portal.portlet.api.state.AccessMode;
import org.jboss.portal.portlet.api.PortletContext;
import org.jboss.portal.portlet.api.StateEvent;
+import org.jboss.portal.portlet.api.PortletStateType;
import org.jboss.portal.portlet.api.spi.InstanceContext;
/**
@@ -99,4 +100,8 @@
{
return modifiedContext;
}
+
+ public PortletStateType<?> getStateType() {
+ return null;
+ }
}
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -23,6 +23,7 @@
package org.jboss.portal.portlet.impl.state;
import org.jboss.portal.portlet.api.state.PropertyMap;
+import org.jboss.portal.portlet.api.PortletStateType;
import org.jboss.portal.portlet.state.SimplePropertyMap;
import org.jboss.portal.portlet.state.StateConversionException;
import org.jboss.portal.portlet.state.StateConverter;
@@ -33,6 +34,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.io.Serializable;
import java.util.Map;
import java.util.List;
import java.util.Arrays;
@@ -57,7 +59,19 @@
/** . */
private static final byte VERSION_ID = 0;
- public byte[] marshall(PortletState state) throws StateConversionException
+ public <S extends Serializable> S marshall(PortletStateType<S> stateType, PortletState state) throws StateConversionException, IllegalArgumentException {
+ if (stateType.getJavaType().equals(byte[].class))
+ {
+ Object bytes = marshall(state);
+ return (S)bytes;
+ }
+ else
+ {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ public byte[] marshall(PortletState state) throws StateConversionException
{
if (state == null)
{
@@ -103,6 +117,19 @@
}
}
+ public <S extends Serializable> PortletState unmarshall(PortletStateType<S> stateType, S marshalledState) throws StateConversionException, IllegalArgumentException
+ {
+ if (stateType.getJavaType().equals(byte[].class))
+ {
+ byte[] bytes = (byte[])marshalledState;
+ return unmarshall(bytes);
+ }
+ else
+ {
+ throw new UnsupportedOperationException();
+ }
+ }
+
public PortletState unmarshall(byte[] marshalledState) throws StateConversionException
{
if (marshalledState == null)
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -28,25 +28,27 @@
import org.jboss.portal.portlet.state.NoSuchStateException;
import org.jboss.portal.portlet.state.InvalidStateIdException;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public abstract class AbstractConsumerPersistenceManagerService implements ConsumerPersistenceManager
+public abstract class AbstractConsumerPersistenceManagerService<S extends Serializable> implements ConsumerPersistenceManager<S>
{
/** . */
private int counter = 0;
- protected abstract ConsumerStateContext get(String stateId);
- protected abstract void put(String stateId, ConsumerStateContext state);
+ protected abstract ConsumerStateContext<S> get(String stateId);
+ protected abstract void put(String stateId, ConsumerStateContext<S> state);
protected abstract void remove(String stateId);
protected abstract int size();
- public synchronized ConsumerStateContext loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
+ public synchronized ConsumerStateContext<S> loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
{
checkId(stateId);
- ConsumerStateContext state = get(stateId);
+ ConsumerStateContext<S> state = get(stateId);
if (state == null)
{
throw new NoSuchStateException(stateId);
@@ -54,18 +56,18 @@
return state;
}
- public synchronized String createState(ConsumerState state) throws IllegalArgumentException
+ public synchronized String createState(ConsumerState<S> state) throws IllegalArgumentException
{
if (state == null)
{
throw new IllegalArgumentException();
}
- ConsumerStateContext ctx = new ConsumerStateContext(Integer.toString(counter++), state.getPortletId(), state.getBytes());
+ ConsumerStateContext<S> ctx = new ConsumerStateContext<S>(Integer.toString(counter++), state.getPortletId(), state.getStateType(), state.getState());
put(ctx.getId(), ctx);
return ctx.getId();
}
- public synchronized void updateState(String stateId, ConsumerState state) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
+ public synchronized void updateState(String stateId, ConsumerState<S> state) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
{
checkId(stateId);
if (state == null)
@@ -78,7 +80,7 @@
}
//
- put(stateId, new ConsumerStateContext(stateId, state.getPortletId(), state.getBytes()));
+ put(stateId, new ConsumerStateContext<S>(stateId, state.getPortletId(), state.getStateType(), state.getState()));
}
public synchronized void destroyState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -23,6 +23,7 @@
package org.jboss.portal.portlet.impl.state.consumer;
import org.jboss.portal.portlet.state.consumer.ConsumerStateContext;
+import org.jboss.portal.portlet.api.PortletStateType;
import java.util.HashMap;
import java.util.Map;
@@ -31,18 +32,22 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class ConsumerPersistenceManagerService extends AbstractConsumerPersistenceManagerService
+public class ConsumerPersistenceManagerService extends AbstractConsumerPersistenceManagerService<byte[]>
{
/** . */
- private Map<String, ConsumerStateContext> store = new HashMap<String, ConsumerStateContext>();
+ private Map<String, ConsumerStateContext<byte[]>> store = new HashMap<String, ConsumerStateContext<byte[]>>();
- protected ConsumerStateContext get(String stateId)
+ public PortletStateType<byte[]> getStateType() {
+ return PortletStateType.OPAQUE;
+ }
+
+ protected ConsumerStateContext<byte[]> get(String stateId)
{
return store.get(stateId);
}
- protected void put(String stateId, ConsumerStateContext state)
+ protected void put(String stateId, ConsumerStateContext<byte[]> state)
{
store.put(stateId, state);
}
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/StateConverter.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/StateConverter.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/StateConverter.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -23,7 +23,10 @@
package org.jboss.portal.portlet.state;
import org.jboss.portal.portlet.state.producer.PortletState;
+import org.jboss.portal.portlet.api.PortletStateType;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5873 $
@@ -33,20 +36,22 @@
/**
* Marshall the producer state as a byte array.
*
+ * @param stateType the state type
* @param state the producer state
* @return the marshalled state
* @throws StateConversionException if marshalling cannot be performed
* @throws IllegalArgumentException if the state is null
*/
- byte[] marshall(PortletState state) throws StateConversionException, IllegalArgumentException;
+ <S extends Serializable> S marshall(PortletStateType<S> stateType, PortletState state) throws StateConversionException, IllegalArgumentException;
/**
* Unmarshall the producer state from a byte array.
*
+ * @param stateType the state type
* @param marshalledState the marshalled state
* @return the producer state
* @throws StateConversionException if unmarshalling cannot be performed
* @throws IllegalArgumentException if the argument is null
*/
- PortletState unmarshall(byte[] marshalledState) throws StateConversionException, IllegalArgumentException;
+ <S extends Serializable> PortletState unmarshall(PortletStateType<S> stateType, S marshalledState) throws StateConversionException, IllegalArgumentException;
}
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPersistenceManager.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPersistenceManager.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPersistenceManager.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -24,13 +24,24 @@
import org.jboss.portal.portlet.state.InvalidStateIdException;
import org.jboss.portal.portlet.state.NoSuchStateException;
+import org.jboss.portal.portlet.api.PortletStateType;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5776 $
*/
-public interface ConsumerPersistenceManager
+public interface ConsumerPersistenceManager<S extends Serializable>
{
+
+ /**
+ * Returns the consumer state type.
+ *
+ * @return the consume state type
+ */
+ PortletStateType<S> getStateType();
+
/**
* Load the state.
*
@@ -40,31 +51,32 @@
* @throws NoSuchStateException is the specified state does not exist
* @throws InvalidStateIdException if the state id is not valid
*/
- ConsumerStateContext loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
+ ConsumerStateContext<S> loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
/**
* Create the initial state.
*
+ * @param state the state
* @return the id of the state created
* @throws IllegalArgumentException if the portlet id is null
*/
- String createState(ConsumerState state) throws IllegalArgumentException;
+ String createState(ConsumerState<S> state) throws IllegalArgumentException;
/**
* Update the state.
*
- * @param stateId
+ * @param stateId the state id
* @param propertyMap the updated state
* @throws IllegalArgumentException if the state id is null or the values are null
* @throws NoSuchStateException is the specified state does not exist
* @throws InvalidStateIdException if the state id is not valid
*/
- void updateState(String stateId, ConsumerState propertyMap) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
+ void updateState(String stateId, ConsumerState<S> propertyMap) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
/**
* Destroy the state.
*
- * @param stateId
+ * @param stateId the state id
* @throws IllegalArgumentException if the state id is null
* @throws NoSuchStateException is the specified state does not exist
* @throws InvalidStateIdException if the state id is not valid
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -29,6 +29,8 @@
import org.jboss.portal.portlet.api.PortletContext;
import org.jboss.portal.portlet.api.StateEvent;
import org.jboss.portal.portlet.api.PortletInvokerException;
+import org.jboss.portal.portlet.api.StatefulPortletContext;
+import org.jboss.portal.portlet.api.PortletStateType;
import org.jboss.portal.portlet.api.state.PropertyMap;
import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.api.invocation.PortletInvocation;
@@ -43,6 +45,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -145,11 +148,14 @@
PortletContext clonedContext = pictx.clonedContext;
if (clonedContext != null)
{
- byte[] state = clonedContext.getState();
- if (state != null)
+ if (clonedContext instanceof StatefulPortletContext)
{
+ StatefulPortletContext statefulClonedContext = (StatefulPortletContext)clonedContext;
+ Serializable state = statefulClonedContext.getState();
+ PortletStateType stateType = statefulClonedContext.getType();
+
// Save the clone state
- ConsumerState consumerState = new ConsumerState(clonedContext.getId(), state);
+ ConsumerState consumerState = new ConsumerState<Serializable>(clonedContext.getId(), stateType, state);
String stateId = persistenceManager.createState(consumerState);
String clonedId = CLONE_ID_PREFIX + stateId;
StateEvent event = new StateEvent(PortletContext.createPortletContext(clonedId), StateEvent.Type.PORTLET_CLONED_EVENT);
@@ -166,13 +172,15 @@
PortletContext modifiedContext = pictx.modifiedContext;
if (modifiedContext != null)
{
- byte[] state = modifiedContext.getState();
// update state if needed
- if (state != null)
+ if (clonedContext instanceof StatefulPortletContext)
{
+ StatefulPortletContext statefulClonedContext = (StatefulPortletContext)clonedContext;
+ Serializable state = statefulClonedContext.getState();
+ PortletStateType stateType = statefulClonedContext.getType();
try
{
- ConsumerState consumerState = new ConsumerState(modifiedContext.getId(), state);
+ ConsumerState consumerState = new ConsumerState<Serializable>(modifiedContext.getId(), stateType, state);
persistenceManager.updateState(consumerContext.stateId, consumerState);
}
catch (NoSuchStateException e)
@@ -204,10 +212,10 @@
//
PortletContext clonedContext = super.createClone(consumerContext.producerPortletContext);
- byte[] state = clonedContext.getState();
- if (state != null)
+ if (clonedContext instanceof StatefulPortletContext)
{
- ConsumerState consumerState = new ConsumerState(clonedContext.getId(), state);
+ StatefulPortletContext statefulClonedContext = (StatefulPortletContext)clonedContext;
+ ConsumerState consumerState = new ConsumerState<Serializable>(clonedContext.getId(), statefulClonedContext.getType(), statefulClonedContext.getState());
String id = persistenceManager.createState(consumerState);
return PortletContext.createPortletContext(CLONE_ID_PREFIX + id);
}
@@ -279,16 +287,20 @@
//
PortletContext updatedPortletContext = super.setProperties(consumerContext.producerPortletContext, changes);
- byte[] state = updatedPortletContext.getState();
- if (state != null)
+ if (updatedPortletContext instanceof StatefulPortletContext)
{
+ StatefulPortletContext statefulUpdatedPortletContext = (StatefulPortletContext)updatedPortletContext;
+ Serializable state = statefulUpdatedPortletContext.getState();
+ PortletStateType stateType = statefulUpdatedPortletContext.getType();
+
+ //
if (consumerContext.stateId == null)
{
throw new NotYetImplemented();
}
//
- ConsumerState consumerState = new ConsumerState(updatedPortletContext.getId(), state);
+ ConsumerState consumerState = new ConsumerState<Serializable>(updatedPortletContext.getId(), stateType, state);
try
{
persistenceManager.updateState(consumerContext.stateId, consumerState);
@@ -314,7 +326,7 @@
return portletContext;
}
- private static class StatefulInstanceContextImpl implements InstanceContext
+ private class StatefulInstanceContextImpl implements InstanceContext
{
/** . */
@@ -353,6 +365,10 @@
break;
}
}
+
+ public PortletStateType<?> getStateType() {
+ return persistenceManager.getStateType();
+ }
}
private ConsumerContext getConsumerContext(PortletContext portletContext) throws IllegalArgumentException, InvalidPortletIdException
@@ -372,7 +388,11 @@
try
{
ConsumerStateContext stateCtx = persistenceManager.loadState(stateId);
- return new ConsumerContext(portletContext, PortletContext.createStatefulPortletContext(stateCtx.getPortletId(), stateCtx.getBytes()), stateId);
+ StatefulPortletContext<Serializable> blah = StatefulPortletContext.create(
+ stateCtx.getPortletId(),
+ stateCtx.getStateType(),
+ stateCtx.getState());
+ return new ConsumerContext(portletContext, blah, stateId);
}
catch (NoSuchStateException e)
{
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerState.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerState.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerState.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -22,36 +22,44 @@
******************************************************************************/
package org.jboss.portal.portlet.state.consumer;
+import org.jboss.portal.portlet.api.PortletStateType;
+
import java.util.Date;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5776 $
*/
-public class ConsumerState
+public class ConsumerState<S extends Serializable>
{
/** . */
- private String portletId;
+ private final String portletId;
/** . */
- private byte[] bytes;
+ private final PortletStateType<S> stateType;
/** . */
- private Date terminationTime;
+ private final S state;
- public ConsumerState(String porteltId, byte[] bytes)
+ /** . */
+ private final Date terminationTime;
+
+ public ConsumerState(String porteltId, PortletStateType<S> stateType, S state)
{
if (porteltId == null)
{
throw new IllegalArgumentException("No portlet id provided");
}
- if (bytes == null)
+ if (state == null)
{
throw new IllegalArgumentException("No bytes provided");
}
this.portletId = porteltId;
- this.bytes = bytes;
+ this.stateType = stateType;
+ this.state = state;
+ this.terminationTime = null;
}
/**
@@ -62,12 +70,17 @@
return portletId;
}
+ public PortletStateType<S> getStateType()
+ {
+ return stateType;
+ }
+
/**
*
*/
- public byte[] getBytes()
+ public S getState()
{
- return bytes;
+ return state;
}
/**
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerStateContext.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerStateContext.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerStateContext.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -22,19 +22,23 @@
******************************************************************************/
package org.jboss.portal.portlet.state.consumer;
+import org.jboss.portal.portlet.api.PortletStateType;
+
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5776 $
*/
-public class ConsumerStateContext extends ConsumerState
+public class ConsumerStateContext<S extends Serializable> extends ConsumerState<S>
{
/** . */
private final String id;
- public ConsumerStateContext(String id, String portletId, byte[] bytes)
+ public ConsumerStateContext(String id, String portletId, PortletStateType<S> stateType, S state)
{
- super(portletId, bytes);
+ super(portletId, stateType, state);
//
if (id == null)
Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -30,6 +30,7 @@
import org.jboss.portal.portlet.api.PortletContext;
import org.jboss.portal.portlet.api.PortletInvokerException;
import org.jboss.portal.portlet.api.StateEvent;
+import org.jboss.portal.portlet.api.PortletStateType;
import org.jboss.portal.portlet.api.state.PropertyMap;
import org.jboss.portal.portlet.api.info.PortletInfo;
import org.jboss.portal.portlet.api.info.PreferenceInfo;
@@ -60,6 +61,7 @@
import java.util.Set;
import java.util.HashSet;
import java.util.Map;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -129,14 +131,14 @@
//
if (CONSUMER_CLONE_ID.equals(portletId))
{
- byte[] state = portletContext.getState();
+ if (portletContext instanceof StatefulPortletContext)
+ {
+ StatefulPortletContext statefulPortletContext = (StatefulPortletContext)portletContext;
+ Serializable state = statefulPortletContext.getState();
- //
- if (state != null)
- {
try
{
- PortletState portletState = stateConverter.unmarshall(state);
+ PortletState portletState = stateConverter.unmarshall(statefulPortletContext.getType(), state);
Portlet delegate = super.getPortlet(PortletContext.createPortletContext(portletState.getPortletId()));
return new ProducerPortlet(portletContext, delegate);
}
@@ -236,17 +238,19 @@
PropertyMap newPrefs = prefs.getPrefs();
//
+ PortletStateType stateType = instanceCtx.getStateType();
+ boolean persistLocally = stateType == null || stateManagementPolicy.persistLocally();
+
+ //
switch(access)
{
case CLONE_BEFORE_WRITE:
{
- boolean persist = stateManagementPolicy.persistLocally();
-
// Create the state
if (context.isStateful())
{
StatefulContext statefulContext = (StatefulContext)context;
- if (persist)
+ if (persistLocally)
{
try
{
@@ -272,7 +276,7 @@
}
else
{
- PortletContext clonedCtx = marshall(context.getPortletId(), newPrefs);
+ PortletContext clonedCtx = marshall(stateType, context.getPortletId(), newPrefs);
StateEvent event = new StateEvent(clonedCtx, StateEvent.Type.PORTLET_CLONED_EVENT);
instanceCtx.onStateEvent(event);
}
@@ -283,7 +287,7 @@
getPropertiesFromMetaData(portlet.getContext(), newPrefs);
//
- if (persist)
+ if (persistLocally)
{
// Create the new state
String cloneStateId = persistenceManager.createState(context.getPortletId(), newPrefs);
@@ -296,7 +300,7 @@
}
else
{
- PortletContext clonedCtx = marshall(context.getPortletId(), newPrefs);
+ PortletContext clonedCtx = marshall(stateType, context.getPortletId(), newPrefs);
StateEvent event = new StateEvent(clonedCtx, StateEvent.Type.PORTLET_CLONED_EVENT);
instanceCtx.onStateEvent(event);
}
@@ -326,7 +330,7 @@
}
else
{
- PortletContext modifiedCtx = marshall(context.getPortletId(), newPrefs);
+ PortletContext modifiedCtx = marshall(stateType, context.getPortletId(), newPrefs);
StateEvent event = new StateEvent(modifiedCtx, StateEvent.Type.PORTLET_MODIFIED_EVENT);
instanceCtx.onStateEvent(event);
}
@@ -354,13 +358,15 @@
//
String portletId = portletContext.getId();
InternalContext context = getStateContext(portletContext);
- boolean useStore = stateManagementPolicy.persistLocally();
//
+ boolean persistLocally = !(portletContext instanceof StatefulPortletContext) || stateManagementPolicy.persistLocally();
+
+ //
if (context.isStateful())
{
StatefulContext statefulContext = (StatefulContext)context;
- if (useStore)
+ if (persistLocally)
{
try
{
@@ -379,21 +385,23 @@
}
else
{
- return marshall(statefulContext.getPortletId(), statefulContext.getProperties());
+ PortletStateType stateType = ((StatefulPortletContext)portletContext).getType();
+ return marshall(stateType, statefulContext.getPortletId(), statefulContext.getProperties());
}
}
else
{
PropertyMap newState = new SimplePropertyMap();
getPropertiesFromMetaData(portletContext, newState);
- if (useStore)
+ if (persistLocally)
{
String cloneId = persistenceManager.createState(portletId, newState);
return PortletContext.createPortletContext(PRODUCER_CLONE_ID_PREFIX + cloneId);
}
else
{
- return marshall(portletId, newState);
+ PortletStateType stateType = ((StatefulPortletContext)portletContext).getType();
+ return marshall(stateType, portletId, newState);
}
}
}
@@ -595,17 +603,18 @@
}
else
{
- return marshall(context.getPortletId(), properties);
+ RemoteContext remoteStatefulContext = (RemoteContext)statefulContext;
+ return marshall(remoteStatefulContext.getStateType(), context.getPortletId(), properties);
}
}
- private PortletContext marshall(String portletId, PropertyMap props) throws PortletInvokerException
+ private <S extends Serializable> PortletContext marshall(PortletStateType<S> stateType, String portletId, PropertyMap props) throws PortletInvokerException
{
try
{
PortletState sstate = new PortletState(portletId, props);
- byte[] marshalledState = stateConverter.marshall(sstate);
- return PortletContext.createStatefulPortletContext(CONSUMER_CLONE_ID, marshalledState);
+ S marshalledState = stateConverter.marshall(stateType, sstate);
+ return StatefulPortletContext.create(CONSUMER_CLONE_ID, stateType, marshalledState);
}
catch (StateConversionException e)
{
@@ -660,8 +669,7 @@
*/
private InternalContext getStateContext(final PortletContext portletContext) throws NoSuchPortletException, InvalidPortletIdException
{
- byte[] bytes = portletContext.getState();
- if (bytes == null)
+ if (!(portletContext instanceof StatefulPortletContext))
{
String portletId = portletContext.getId();
if (portletContext.getId().startsWith(PRODUCER_CLONE_ID_PREFIX))
@@ -688,10 +696,13 @@
}
else
{
+ StatefulPortletContext statefulPortletContext = (StatefulPortletContext)portletContext;
+ Serializable bytes = statefulPortletContext.getState();
+ PortletStateType stateType = statefulPortletContext.getType();
try
{
- final PortletState state = stateConverter.unmarshall(bytes);
- return new RemoteContext(state.getPortletId(), state.getProperties());
+ final PortletState state = stateConverter.unmarshall(stateType, bytes);
+ return new RemoteContext(stateType, state.getPortletId(), state.getProperties());
}
catch (StateConversionException e)
{
@@ -826,13 +837,24 @@
private static class RemoteContext extends StatefulContext
{
- public RemoteContext(String portletId, PropertyMap state)
+ /** . */
+ private final PortletStateType stateType;
+
+ public RemoteContext(PortletStateType stateType, String portletId, PropertyMap state)
{
super(portletId, state);
+
+ //
+ this.stateType = stateType;
}
- public boolean isLocal()
+ public PortletStateType getStateType()
{
+ return stateType;
+ }
+
+ public boolean isLocal()
+ {
return false;
}
}
Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -25,6 +25,8 @@
import org.jboss.portal.portlet.api.PortletInvokerException;
import org.jboss.portal.portlet.api.PortletContext;
import org.jboss.portal.portlet.api.Portlet;
+import org.jboss.portal.portlet.api.PortletStateType;
+import org.jboss.portal.portlet.api.StatefulPortletContext;
import org.jboss.portal.portlet.support.info.PortletInfoSupport;
import org.jboss.portal.portlet.api.invocation.PortletInvocation;
import org.jboss.portal.portlet.api.invocation.ActionInvocation;
Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -23,6 +23,7 @@
package org.jboss.portal.portlet.support.spi;
import org.jboss.portal.portlet.api.StateEvent;
+import org.jboss.portal.portlet.api.PortletStateType;
import org.jboss.portal.portlet.api.spi.InstanceContext;
import org.jboss.portal.portlet.api.state.AccessMode;
@@ -46,4 +47,8 @@
{
throw new UnsupportedOperationException();
}
+
+ public PortletStateType<?> getStateType() {
+ throw new UnsupportedOperationException();
+ }
}
Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -29,6 +29,7 @@
import org.jboss.portal.portlet.api.Portlet;
import org.jboss.portal.portlet.api.PortletContext;
import org.jboss.portal.portlet.api.PortletInvokerException;
+import org.jboss.portal.portlet.api.StatefulPortletContext;
import org.jboss.portal.portlet.api.state.PropertyMap;
import org.jboss.portal.portlet.support.info.PortletInfoSupport;
import org.jboss.portal.portlet.support.PortletSupport;
@@ -900,7 +901,7 @@
PortletSupport portletSupport = getPortletSupport(popCtx);
portletSupport.addHandler(handler);
addPreference(popCtx, "abc", Arrays.asList("def"));
-
+
//
PortletContext ccpCtx = createClone(popCtx);
@@ -932,9 +933,20 @@
// Test handle first
assertEquals(expected.getId(), actual.getId());
- // Compare bytes
- byte[] expectedState = expected.getState();
- byte[] actualState = actual.getState();
+ // Compare States
+ Object expectedState = null;
+ Object actualState = null;
+
+ if (expected instanceof StatefulPortletContext)
+ {
+ expectedState = ((StatefulPortletContext)expected).getState();
+ }
+
+ if (actual instanceof StatefulPortletContext)
+ {
+ actualState = ((StatefulPortletContext)actual).getState();
+ }
+
if (expectedState == null)
{
assertNull("Actual state should be null", actualState);
@@ -942,7 +954,7 @@
else
{
assertNotNull("Actual state should be not null", actualState);
- assertTrue(Arrays.equals(expectedState, actualState));
+ assertTrue(expectedState.equals(actualState));
}
}
}
Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java
===================================================================
--- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -23,6 +23,7 @@
package org.jboss.portal.test.portlet.state;
import org.jboss.portal.portlet.impl.state.StateConverterV0;
+import org.jboss.portal.portlet.api.PortletStateType;
import org.jboss.portal.portlet.api.state.PropertyMap;
import org.jboss.portal.portlet.state.SimplePropertyMap;
import org.jboss.portal.portlet.state.StateConversionException;
@@ -50,7 +51,7 @@
{
try
{
- converter.marshall(null);
+ converter.marshall(PortletStateType.OPAQUE, null);
fail("Was expecting an IAE");
}
catch (IllegalArgumentException expected)
@@ -58,7 +59,7 @@
}
try
{
- converter.unmarshall(null);
+ converter.unmarshall(PortletStateType.OPAQUE, null);
fail("Was expecting an IAE");
}
catch (IllegalArgumentException expected)
@@ -69,14 +70,14 @@
@Test
public void testAlteredMagic() throws StateConversionException
{
- byte[] bytes = converter.marshall(new PortletState("foo"));
+ byte[] bytes = converter.marshall(PortletStateType.OPAQUE, new PortletState("foo"));
bytes[0] = (byte)0xCA;
bytes[1] = (byte)0xFE;
bytes[2] = (byte)0xBA;
bytes[3] = (byte)0xBE;
try
{
- converter.unmarshall(bytes);
+ converter.unmarshall(PortletStateType.OPAQUE, bytes);
fail("Was expecting a state conversion exception");
}
catch (StateConversionException expected)
@@ -87,11 +88,11 @@
@Test
public void testBadVersionNumber() throws StateConversionException
{
- byte[] bytes = converter.marshall(new PortletState("foo"));
+ byte[] bytes = converter.marshall(PortletStateType.OPAQUE,new PortletState("foo"));
bytes[4] = (byte)0x01;
try
{
- converter.unmarshall(bytes);
+ converter.unmarshall(PortletStateType.OPAQUE, bytes);
fail("Was expecting a state conversion exception");
}
catch (StateConversionException expected)
@@ -118,9 +119,9 @@
private void assertWorks(PortletState expectedState) throws Exception
{
- byte[] bytes = converter.marshall(expectedState);
+ byte[] bytes = converter.marshall(PortletStateType.OPAQUE, expectedState);
assertNotNull(bytes);
- PortletState state = converter.unmarshall(bytes);
+ PortletState state = converter.unmarshall(PortletStateType.OPAQUE, bytes);
assertNotNull(state);
//
Modified: jbossexo/modules/portlet/trunk/test/pom.xml
===================================================================
--- jbossexo/modules/portlet/trunk/test/pom.xml 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/test/pom.xml 2009-08-18 03:49:09 UTC (rev 13774)
@@ -167,6 +167,11 @@
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- JSTL for Tomcat -->
<dependency>
@@ -184,6 +189,11 @@
<artifactId>exo.kernel.container</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.exoplatform.portletcontainer</groupId>
+ <artifactId>exo.pc.component.common</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
@@ -263,7 +273,8 @@
<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
<property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
<property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/>
- <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
+ <!-- <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> -->
+ <property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/>
<property name="dependency.portal-common-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/>
<property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/>
@@ -274,7 +285,7 @@
<property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/>
<property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/>
<property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-mc.jar.path}"/>
- <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/>
+ <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.jar.path}"/>
<property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-api.jar.path}"/>
<property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
@@ -293,7 +304,7 @@
<property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
<property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
<property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
+ <!-- <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> -->
<property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
<property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
@@ -312,8 +323,9 @@
<!-- EXO -->
<property name="dependency.exo.kernel.container" value="${maven.dependency.org.exoplatform.kernel.exo.kernel.container.jar.path}"/>
<property name="dependency.exo.kernel.commons" value="${maven.dependency.org.exoplatform.kernel.exo.kernel.commons.jar.path}"/>
+ <property name="dependency.exo.pc.component.common" value="${maven.dependency.org.exoplatform.portletcontainer.exo.pc.component.common.jar.path}"/>
<property name="dependency.picocontainer" value="${maven.dependency.picocontainer.picocontainer.jar.path}"/>
- <property name="dependency.commons.logging" value="${maven.dependency.commons-logging.commons-logging-api.jar.path}"/>
+ <property name="dependency.commons.logging" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
<property name="dependency.jibx" value="${maven.dependency.org.jibx.jibx-run.jar.path}"/>
<property name="dependency.javax.xml.stream" value="${maven.dependency.javax.xml.stream.stax-api.jar.path}"/>
<property name="dependency.xpp3" value="${maven.dependency.xpp3.xpp3.jar.path}"/>
Added: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ExoKernelIntegration.java
===================================================================
--- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ExoKernelIntegration.java (rev 0)
+++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ExoKernelIntegration.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -0,0 +1,173 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2009, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This 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 software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.portal.portlet.test;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.api.PortletInvoker;
+import org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor;
+import org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor;
+import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
+import org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor;
+import org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor;
+import org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor;
+import org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor;
+import org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor;
+import org.jboss.portal.portlet.aspects.portlet.ValveInterceptor;
+import org.jboss.portal.portlet.container.ContainerPortletDispatcher;
+import org.jboss.portal.portlet.container.ContainerPortletInvoker;
+import org.jboss.portal.portlet.impl.state.StateConverterV0;
+import org.jboss.portal.portlet.impl.state.StateManagementPolicyService;
+import org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService;
+import org.jboss.portal.portlet.state.producer.PortletStatePersistenceManager;
+import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker;
+import org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter;
+import org.jboss.portal.web.ServletContainer;
+import org.jboss.unit.remote.driver.RemoteTestDriverServer;
+
+import javax.servlet.http.HttpServlet;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class ExoKernelIntegration extends HttpServlet
+{
+
+ //protected PortletApplicationDeployer portletApplicationRegistry;
+ protected TestPortletApplicationDeployer portletApplicationRegistry;
+ protected GenericServiceExporter testDriverServerExporter;
+ private static final String LOCAL_PORTLET_INVOKER_ID = "local";
+
+ public void init()
+ {
+
+ RemoteTestDriverServer testDriverServer = new RemoteTestDriverServer();
+ testDriverServerExporter = new GenericServiceExporter("socket://localhost:5400", testDriverServer, "org.jboss.unit.remote.driver.RemoteTestDriver");
+
+ ExoContainer container = ExoContainerContext.getCurrentContainer();
+
+ // The producer persistence manager
+ PortletStatePersistenceManagerService producerPersistenceManager = new PortletStatePersistenceManagerService();
+ // register the persistence manager so that it can be used by WSRP
+ container.registerComponentInstance(PortletStatePersistenceManager.class, producerPersistenceManager);
+
+ // The producer state management policy
+ StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService();
+ producerStateManagementPolicy.setPersistLocally(true);
+
+ // The producer state converter
+ StateConverterV0 producerStateConverter = new StateConverterV0();
+
+ // The portlet container invoker
+ ContainerPortletInvoker containerPortletInvoker = new ContainerPortletInvoker();
+ // continued below
+
+
+ // The portlet application deployer
+ portletApplicationRegistry = new TestPortletApplicationDeployer();//new PortletApplicationDeployer();
+ portletApplicationRegistry.setContainerPortletInvoker(containerPortletInvoker);
+ portletApplicationRegistry.setDriver(testDriverServer);
+
+ //Container Stack
+ ContainerPortletDispatcher portletContainerDispatcher = new ContainerPortletDispatcher();
+ EventPayloadInterceptor eventPayloadInterceptor = new EventPayloadInterceptor();
+ eventPayloadInterceptor.setNext(portletContainerDispatcher);
+ RequestAttributeConversationInterceptor requestAttributeConversationInterceptor = new RequestAttributeConversationInterceptor();
+ requestAttributeConversationInterceptor.setNext(eventPayloadInterceptor);
+ CCPPInterceptor ccppInterceptor = new CCPPInterceptor();
+ ccppInterceptor.setNext(requestAttributeConversationInterceptor);
+ ProducerCacheInterceptor producerCacheInterceptor = new ProducerCacheInterceptor();
+ producerCacheInterceptor.setNext(ccppInterceptor);
+ ContextDispatcherInterceptor contextDispatcherInterceptor = new ContextDispatcherInterceptor();
+ contextDispatcherInterceptor.setNext(producerCacheInterceptor);
+ SecureTransportInterceptor secureTransportInterceptor = new SecureTransportInterceptor();
+ secureTransportInterceptor.setNext(contextDispatcherInterceptor);
+ ValveInterceptor valveInterceptor = new ValveInterceptor();
+ valveInterceptor.setPortletApplicationRegistry(portletApplicationRegistry);
+ valveInterceptor.setNext(secureTransportInterceptor);
+
+ // inject ServletContainer in objects that need it
+ ServletContainer servletContainer = (ServletContainer)container.getComponentInstance(ServletContainer.class);
+ portletApplicationRegistry.setServletContainer(servletContainer);
+ contextDispatcherInterceptor.setServletContainer(servletContainer);
+
+ // The portlet container invoker continued
+ containerPortletInvoker.setNext(valveInterceptor);
+
+ // The producer portlet invoker
+ ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker();
+ producerPortletInvoker.setNext(containerPortletInvoker);
+ producerPortletInvoker.setPersistenceManager(producerPersistenceManager);
+ producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy);
+ producerPortletInvoker.setStateConverter(producerStateConverter);
+
+ // register producer portlet invoker so that WSRP can use it
+ container.registerComponentInstance(ProducerPortletInvoker.class, producerPortletInvoker);
+
+ // The consumer portlet invoker
+ PortletCustomizationInterceptor portletCustomizationInterceptor = new PortletCustomizationInterceptor();
+ portletCustomizationInterceptor.setNext(producerPortletInvoker);
+ ConsumerCacheInterceptor consumerCacheInterceptor = new ConsumerCacheInterceptor();
+ consumerCacheInterceptor.setNext(portletCustomizationInterceptor);
+ PortletInvokerInterceptor consumerPortletInvoker = new PortletInvokerInterceptor();
+ consumerPortletInvoker.setNext(consumerCacheInterceptor);
+
+ //container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker);
+
+ // Federating portlet invoker
+ //FederatingPortletInvoker federatingPortletInvoker = new FederatingPortletInvokerService();
+
+ // register local portlet invoker with federating portlet invoker
+ //federatingPortletInvoker.registerInvoker(LOCAL_PORTLET_INVOKER_ID, containerPortletInvoker);//containerPortletInvoker);
+
+ /* register with container */
+ container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); //federatingPortletInvoker);
+
+ portletApplicationRegistry.start();
+
+ try
+ {
+ testDriverServerExporter.start();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+
+ public void destroy()
+ {
+ if (portletApplicationRegistry != null)
+ {
+ portletApplicationRegistry.stop();
+ }
+ if (testDriverServerExporter != null)
+ {
+ testDriverServerExporter.stop();
+ }
+ }
+}
+
Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java
===================================================================
--- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -23,6 +23,8 @@
package org.jboss.portal.portlet.test.controller;
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
import org.jboss.portal.portlet.api.Portlet;
import org.jboss.portal.portlet.api.PortletContext;
import org.jboss.portal.portlet.api.PortletInvoker;
@@ -71,7 +73,12 @@
super(req, resp);
//
- this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
+ //this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
+
+ ExoContainer exoContainer = ExoContainerContext.getCurrentContainer();
+ this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class);
+
+
this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
this.stateControllerContext = new StateControllerContextImpl(this);
this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext);
Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java
===================================================================
--- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2009-08-18 03:49:09 UTC (rev 13774)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.portlet.test.tck;
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext;
import org.jboss.portal.portlet.api.Portlet;
import org.jboss.portal.portlet.api.PortletInvokerException;
@@ -71,7 +73,11 @@
super(req, resp);
//
- this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
+ //this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
+ ExoContainer exoContainer = ExoContainerContext.getCurrentContainer();
+ this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class);
+
+
this.stateControllerContext = new TCKStateControllerContext(new StateControllerContextImpl(this));
this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
this.serialization = new TCKPageNavigationalStateSerialization(stateControllerContext);
Modified: jbossexo/modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- jbossexo/modules/portlet/trunk/test/src/test/build.xml 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/test/src/test/build.xml 2009-08-18 03:49:09 UTC (rev 13774)
@@ -100,6 +100,7 @@
<pathelement path="${dependency.jibx}"/>
<pathelement path="${dependency.javax.xml.stream}"/>
<pathelement path="${dependency.xpp3}"/>
+ <pathelement path="${dependency.exo.pc.component.common}"/>
</path>
<path id="jboss-unit">
Modified: jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2009-08-18 03:49:09 UTC (rev 13774)
@@ -22,7 +22,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
+<!--
<bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
<bean name="TestDriverServerExporter"
@@ -40,32 +40,32 @@
<property name="driver"><inject bean="TestDriverServer"/></property>
<property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
</bean>
-
+-->
<!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+<!-- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
<constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
</bean>
-
+-->
<!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+<!-- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
<constructor factoryMethod="getServletContainer">
<factory bean="ServletContainerFactory"/>
</constructor>
</bean>
-
+-->
<!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
+<!-- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+-->
<!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+<!-- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
<property name="persistLocally"><value>true</value></property>
</bean>
-
+-->
<!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
+<!-- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+-->
<!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
+<!-- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
<property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
</bean>
<bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
@@ -74,22 +74,22 @@
<bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
<property name="next"><inject bean="ProducerPortletInvoker"/></property>
</bean>
-
+-->
<!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+<!-- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
<property name="next"><inject bean="ContainerPortletInvoker"/></property>
<property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
<property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
<property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
</bean>
-
+-->
<!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+<!-- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
<property name="next"><inject bean="ValveInterceptor"/></property>
</bean>
-
+-->
<!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+<!-- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
<property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
<property name="next"><inject bean="SecureTransportInterceptor"/></property>
</bean>
@@ -114,5 +114,5 @@
</bean>
<bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
</bean>
-
+-->
</deployment>
Modified: jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-08-18 03:49:09 UTC (rev 13774)
@@ -34,9 +34,14 @@
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
+ <servlet-name>exoint</servlet-name>
+ <servlet-class>org.jboss.portal.portlet.test.ExoKernelIntegration</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
<servlet-name>ContainerServlet</servlet-name>
<servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
+ <load-on-startup>0</load-on-startup>
</servlet>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Modified: jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2009-08-18 03:49:09 UTC (rev 13774)
@@ -22,7 +22,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
+<!--
<bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
<bean name="TestDriverServerExporter"
@@ -33,39 +33,39 @@
<parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
</constructor>
</bean>
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
+-->
+<!-- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
<alias>PortletApplicationRegistry</alias>
<property name="servletContainer"><inject bean="ServletContainer"/></property>
<property name="driver"><inject bean="TestDriverServer"/></property>
<property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
</bean>
-
+-->
<!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+<!-- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
<constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
</bean>
-
+-->
<!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+<!-- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
<constructor factoryMethod="getServletContainer">
<factory bean="ServletContainerFactory"/>
</constructor>
</bean>
-
+-->
<!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
+<!-- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+-->
<!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+<!-- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
<property name="persistLocally"><value>true</value></property>
</bean>
-
+-->
<!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
+<!-- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+-->
<!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
+<!-- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
<property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
</bean>
<bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
@@ -74,22 +74,22 @@
<bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
<property name="next"><inject bean="ProducerPortletInvoker"/></property>
</bean>
-
+-->
<!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+<!-- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
<property name="next"><inject bean="ContainerPortletInvoker"/></property>
<property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
<property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
<property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
</bean>
-
+-->
<!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+<!-- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
<property name="next"><inject bean="ValveInterceptor"/></property>
</bean>
-
+-->
<!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+<!-- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
<property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
<property name="next"><inject bean="SecureTransportInterceptor"/></property>
</bean>
@@ -114,5 +114,5 @@
</bean>
<bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
</bean>
-
+-->
</deployment>
Modified: jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-08-17 20:06:05 UTC (rev 13773)
+++ jbossexo/modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-08-18 03:49:09 UTC (rev 13774)
@@ -34,9 +34,14 @@
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
+ <servlet-name>exoint</servlet-name>
+ <servlet-class>org.jboss.portal.portlet.test.ExoKernelIntegration</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
<servlet-name>ContainerServlet</servlet-name>
<servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
+ <load-on-startup>0</load-on-startup>
</servlet>
<servlet>
<servlet-name>PortalServlet</servlet-name>
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13773 - jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-08-17 16:06:05 -0400 (Mon, 17 Aug 2009)
New Revision: 13773
Modified:
jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java
Log:
- Re-enabled registration of producer invoker.
- Register federating portlet invoker instead of invoker directly on the consumer side.
Modified: jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java
===================================================================
--- jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-08-17 20:04:27 UTC (rev 13772)
+++ jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-08-17 20:06:05 UTC (rev 13773)
@@ -57,7 +57,6 @@
{
protected PortletApplicationDeployer portletApplicationRegistry;
- private static final String LOCAL_PORTLET_INVOKER_ID = "local";
public void init()
{
@@ -118,8 +117,7 @@
producerPortletInvoker.setStateConverter(producerStateConverter);
// register producer portlet invoker so that WSRP can use it
- // TODO: renable this. We cannot have two services registered that provide the portlet invoker interface
- //container.registerComponentInstance(ProducerPortletInvoker.class, producerPortletInvoker);
+ container.registerComponentInstance(ProducerPortletInvoker.class, producerPortletInvoker);
// The consumer portlet invoker
PortletCustomizationInterceptor portletCustomizationInterceptor = new PortletCustomizationInterceptor();
@@ -129,18 +127,17 @@
PortletInvokerInterceptor consumerPortletInvoker = new PortletInvokerInterceptor();
consumerPortletInvoker.setNext(consumerCacheInterceptor);
- //container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker);
+ container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker);
// Federating portlet invoker
FederatingPortletInvoker federatingPortletInvoker = new FederatingPortletInvokerService();
// register local portlet invoker with federating portlet invoker
- federatingPortletInvoker.registerInvoker(LOCAL_PORTLET_INVOKER_ID, consumerPortletInvoker);//containerPortletInvoker);
+ federatingPortletInvoker.registerInvoker(FederatingPortletInvoker.LOCAL_PORTLET_INVOKER_ID, consumerPortletInvoker);
/* register with container */
- container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); //federatingPortletInvoker);
-
-
+ container.registerComponentInstance(PortletInvoker.class, federatingPortletInvoker);
+
portletApplicationRegistry.start();
}
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13772 - in jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation: impl and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-08-17 16:04:27 -0400 (Mon, 17 Aug 2009)
New Revision: 13772
Modified:
jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java
jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java
Log:
- Modify FederatingPortletInvoker implementation so that local invoker doesn't wrap portlet contexts to add invoker id.
Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java
===================================================================
--- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java 2009-08-17 15:26:42 UTC (rev 13771)
+++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java 2009-08-17 20:04:27 UTC (rev 13772)
@@ -1,25 +1,25 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This 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 software 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 software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2009, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This 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 software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.portal.portlet.federation;
import org.jboss.portal.portlet.api.PortletInvoker;
@@ -35,10 +35,13 @@
*/
public interface FederatingPortletInvoker extends PortletInvoker
{
+ /** The identifier assigned to the local PortletInvoker. */
+ String LOCAL_PORTLET_INVOKER_ID = "local";
+
/**
* Registers an invoker.
*
- * @param federatedId the invoker id to register
+ * @param federatedId the invoker id to register
* @param registeredInvoker the invoker to register
* @throws IllegalArgumentException if the invoker is null or already registered
*/
Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2009-08-17 15:26:42 UTC (rev 13771)
+++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2009-08-17 20:04:27 UTC (rev 13772)
@@ -59,7 +59,7 @@
private static final Logger log = Logger.getLogger(FederatingPortletInvokerService.class);
/** The separator used in the id to route to the correct invoker. */
- static final String SEPARATOR = ".";
+ static final String SEPARATOR = ".:.";
/** The registred FederatedPortletInvokers. */
private volatile Map<String, FederatedPortletInvoker> registry = new HashMap<String, FederatedPortletInvoker>();
@@ -68,17 +68,33 @@
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(federatedId, "Federated PortletInvoker id", null);
ParameterValidation.throwIllegalArgExceptionIfNull(federatedInvoker, "Federated PortletInvoker");
+
if (registry.containsKey(federatedId))
{
throw new IllegalArgumentException("Attempting dual registration of " + federatedId);
}
+
Map<String, FederatedPortletInvoker> copy = new HashMap<String, FederatedPortletInvoker>(registry);
- FederatedPortletInvokerService invoker = new FederatedPortletInvokerService(this, federatedId, federatedInvoker);
+
+ FederatedPortletInvoker invoker;
+ if (isLocalInvoker(federatedId))
+ {
+ invoker = new LocalFederatedPortletInvoker(federatedInvoker);
+ }
+ else
+ {
+ invoker = new FederatedPortletInvokerService(this, federatedId, federatedInvoker);
+ }
copy.put(federatedId, invoker);
registry = copy;
return invoker;
}
+ private boolean isLocalInvoker(String federatedId)
+ {
+ return FederatingPortletInvoker.LOCAL_PORTLET_INVOKER_ID.equals(federatedId);
+ }
+
public synchronized void unregisterInvoker(String federatedId)
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(federatedId, "Federated PortletInvoker id", null);
@@ -107,7 +123,7 @@
public Set<Portlet> getPortlets() throws PortletInvokerException
{
LinkedHashSet<Portlet> portlets = new LinkedHashSet<Portlet>();
- for (FederatedPortletInvoker federated : registry.values())
+ for (FederatedPortletInvoker federated : getFederatedInvokers())
{
try
{
@@ -209,15 +225,14 @@
//
String compoundPortletId = compoundPortletContext.getId();
- //
+ // extract the invoker id if it's present in the portlet context, otherwise default to local invoker id
int pos = compoundPortletId.indexOf(SEPARATOR);
- if (pos == -1)
+ String invokerId = FederatingPortletInvoker.LOCAL_PORTLET_INVOKER_ID;
+ if (pos != -1)
{
- throw new IllegalArgumentException("Bad portlet id format " + compoundPortletId);
+ invokerId = compoundPortletId.substring(0, pos);
}
- //
- String invokerId = compoundPortletId.substring(0, pos);
FederatedPortletInvoker federated = registry.get(invokerId);
if (federated == null)
{
@@ -227,4 +242,65 @@
//
return federated;
}
+
+ private static class LocalFederatedPortletInvoker implements FederatedPortletInvoker
+ {
+ private PortletInvoker invoker;
+
+ private LocalFederatedPortletInvoker(PortletInvoker invoker)
+ {
+ this.invoker = invoker;
+ }
+
+ public String getId()
+ {
+ return FederatingPortletInvoker.LOCAL_PORTLET_INVOKER_ID;
+ }
+
+ public PortletInvoker getPortletInvoker()
+ {
+ return invoker;
+ }
+
+
+ public Set<Portlet> getPortlets() throws PortletInvokerException
+ {
+ return invoker.getPortlets();
+ }
+
+ public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ return invoker.getPortlet(portletContext);
+ }
+
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException
+ {
+ return invoker.invoke(invocation);
+ }
+
+ public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return invoker.createClone(portletContext);
+ }
+
+ public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return invoker.destroyClones(portletContexts);
+ }
+
+ public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return invoker.getProperties(portletContext);
+ }
+
+ public PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return invoker.getProperties(portletContext);
+ }
+
+ public PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ return invoker.setProperties(portletContext, changes);
+ }
+ }
}
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13770 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-08-17 10:28:34 -0400 (Mon, 17 Aug 2009)
New Revision: 13770
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties
Log:
[selenium] - end2end portal admin asserts fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties 2009-08-17 08:26:51 UTC (rev 13769)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/assert.properties 2009-08-17 14:28:34 UTC (rev 13770)
@@ -1,5 +1,5 @@
selenium.timeout.page=180000
-selenium.timeout.ajax=3000
+selenium.timeout.ajax=6000
selenium.timeout.elem=220
portal.xxs.1=/Dave</option><script>alert(document.cookie);</script>
@@ -19,6 +19,17 @@
portal.port.ins.msg.pi.prop.update.valid=is an invalid preference name
portal.port.ins.msg.pi.prop.append.valid=is an invalid preference name
+portal.e2e.port1=Cart Portlet
+portal.e2e.port1.str=Cart Portlet
+portal.e2e.port2=IM2Work
+portal.e2e.port2.str=IM2Work
+portal.e2e.port3=Web Assurance
+portal.e2e.port3.str=web-assurance.net
+portal.e2e.port4=dir1/foo.txt
+portal.e2e.port4.str=File Portlet
+portal.e2e.port5=default/project.html
+portal.e2e.port5.str=Our wiki knowledge base
+
samples.ajax.p3.l3=$256.00
samples.ajax.p3.l2=SANTA CRUZ ALLSTAR
samples.ajax.p3.l1=Product ID: 3
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13769 - docs/enterprise/trunk/User_Guide/ja-JP.
by portal-commits＠lists.jboss.org
Author: khashida(a)redhat.com
Date: 2009-08-17 04:26:51 -0400 (Mon, 17 Aug 2009)
New Revision: 13769
Modified:
docs/enterprise/trunk/User_Guide/ja-JP/Author_Group.po
docs/enterprise/trunk/User_Guide/ja-JP/Book_Info.po
docs/enterprise/trunk/User_Guide/ja-JP/Feedback.po
docs/enterprise/trunk/User_Guide/ja-JP/Preface.po
docs/enterprise/trunk/User_Guide/ja-JP/Revision_History.po
docs/enterprise/trunk/User_Guide/ja-JP/User_Role.po
Log:
28.12 hours left
Modified: docs/enterprise/trunk/User_Guide/ja-JP/Author_Group.po
===================================================================
--- docs/enterprise/trunk/User_Guide/ja-JP/Author_Group.po 2009-08-17 03:53:49 UTC (rev 13768)
+++ docs/enterprise/trunk/User_Guide/ja-JP/Author_Group.po 2009-08-17 08:26:51 UTC (rev 13769)
@@ -1,20 +1,24 @@
+# translation of Author_Group.po to Japanese
# Language ja-JP translations for User_Guide package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: User_Guide VERSION\n"
+"Project-Id-Version: Author_Group\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:58+0000\n"
-"PO-Revision-Date: 2009-08-14 00:58+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 12:54+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: author
#: Author_Group.xml:6
#, no-c-format
msgid "<firstname>Red Hat</firstname> <surname></surname>"
-msgstr ""
+msgstr "<firstname>Red Hat</firstname> <surname></surname>"
+
Modified: docs/enterprise/trunk/User_Guide/ja-JP/Book_Info.po
===================================================================
--- docs/enterprise/trunk/User_Guide/ja-JP/Book_Info.po 2009-08-17 03:53:49 UTC (rev 13768)
+++ docs/enterprise/trunk/User_Guide/ja-JP/Book_Info.po 2009-08-17 08:26:51 UTC (rev 13769)
@@ -1,23 +1,26 @@
+# translation of Book_Info.po to Japanese
# Language ja-JP translations for User_Guide package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: 0\n"
+"Project-Id-Version: Book_Info\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:58+0000\n"
-"PO-Revision-Date: 2009-08-14 00:58+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 13:40+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Book_Info.xml:6
#, no-c-format
msgid "User Guide"
-msgstr ""
+msgstr "ユーザーガイド"
#. Tag: para
#: Book_Info.xml:13
@@ -26,6 +29,8 @@
"This document is intended for those using JBoss Portal as End-Users. This is "
"a \"Where do I Click?\" Guide."
msgstr ""
+"このドキュメントは JBoss Portal をエンドユーザーとしてご使用の人を対象としています。 "
+"これは、\"Where do I Click?\" （どこをクリックしたらいいの？）ガイドです。"
#. Tag: para
#: Book_Info.xml:14
@@ -36,15 +41,20 @@
"available from our <ulink url=\"http://labs.jboss.com/portal/jbossportal/"
"docs/index.html\">documentation page</ulink> ."
msgstr ""
+"Portlet 開発者、Portal 管理者、及び JBoss Portal フレームワークの実装や拡張希望の "
+"方々には、弊社のサイト <ulink url=\"http://labs.jboss.com/portal/jbossportal/"
+"docs/index.html\">documentation page</ulink> で Reference Guide （リファレンスガイド）が "
+"取得できます。"
#. Tag: phrase
#: Book_Info.xml:26
#, no-c-format
msgid "Logo"
-msgstr ""
+msgstr "Logo"
#. Tag: holder
#: Book_Info.xml:31
#, no-c-format
msgid "&HOLDER;"
-msgstr ""
+msgstr "&HOLDER;"
+
Modified: docs/enterprise/trunk/User_Guide/ja-JP/Feedback.po
===================================================================
--- docs/enterprise/trunk/User_Guide/ja-JP/Feedback.po 2009-08-17 03:53:49 UTC (rev 13768)
+++ docs/enterprise/trunk/User_Guide/ja-JP/Feedback.po 2009-08-17 08:26:51 UTC (rev 13769)
@@ -1,35 +1,38 @@
+# translation of Feedback.po to Japanese
# Language ja-JP translations for User_Guide package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: User_Guide VERSION\n"
+"Project-Id-Version: Feedback\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:58+0000\n"
-"PO-Revision-Date: 2009-08-14 00:58+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 13:33+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Feedback.xml:6
#, no-c-format
msgid "We Need Feedback!"
-msgstr ""
+msgstr "フィードバックをお願いします。"
#. Tag: primary
#: Feedback.xml:8
#, no-c-format
msgid "feedback"
-msgstr ""
+msgstr "feedback"
#. Tag: secondary
#: Feedback.xml:9
#, no-c-format
msgid "contact information for this manual"
-msgstr ""
+msgstr "このマニュアルに関する連絡先の情報"
#. Tag: para
#: Feedback.xml:11
@@ -45,3 +48,12 @@
"describing it. If you have found an error, please include the section number "
"and some of the surrounding text so we can find it easily."
msgstr ""
+"このマニュアル内で誤字・脱字を発見されたり、又はこのマニュアルの改善案を "
+"お持ちの場合は、弊社までご連絡下さい。バージョン: <emphasis>&JBEPPVERS;</emphasis>、 "
+"コンポーネント:<emphasis>Documentation</emphasis> に対して "
+"<ulink url=\"http://jira.jboss.com/jira/browse/JBEPP\">JIRA</"
+"ulink> まで報告の提出をお願いします。バグレポートを提出される場合は、マニュアルの識別子: "
+"Portal_User_Guide も忘れずに入力して下さい。ドキュメントを改善する提案をお持ちの場合は、 "
+"なるべく詳しく説明して下さい。エラーを発見された場合は、そのセクション番号とその周辺の "
+"文章を含んで頂くと弊社で素早く見つけることができます。"
+
Modified: docs/enterprise/trunk/User_Guide/ja-JP/Preface.po
===================================================================
--- docs/enterprise/trunk/User_Guide/ja-JP/Preface.po 2009-08-17 03:53:49 UTC (rev 13768)
+++ docs/enterprise/trunk/User_Guide/ja-JP/Preface.po 2009-08-17 08:26:51 UTC (rev 13769)
@@ -1,20 +1,24 @@
+# translation of Preface.po to Japanese
# Language ja-JP translations for User_Guide package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: User_Guide VERSION\n"
+"Project-Id-Version: Preface\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:58+0000\n"
-"PO-Revision-Date: 2009-08-14 00:58+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 12:55+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Preface.xml:6
#, no-c-format
msgid "Preface"
-msgstr ""
+msgstr "序文"
+
Modified: docs/enterprise/trunk/User_Guide/ja-JP/Revision_History.po
===================================================================
--- docs/enterprise/trunk/User_Guide/ja-JP/Revision_History.po 2009-08-17 03:53:49 UTC (rev 13768)
+++ docs/enterprise/trunk/User_Guide/ja-JP/Revision_History.po 2009-08-17 08:26:51 UTC (rev 13769)
@@ -1,23 +1,26 @@
+# translation of Revision_History.po to Japanese
# Language ja-JP translations for User_Guide package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: User_Guide VERSION\n"
+"Project-Id-Version: Revision_History\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:58+0000\n"
-"PO-Revision-Date: 2009-08-14 00:58+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 12:55+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Revision_History.xml:6
#, no-c-format
msgid "Revision History"
-msgstr ""
+msgstr "改訂履歴"
#. Tag: author
#: Revision_History.xml:12
@@ -26,3 +29,6 @@
"<firstname>Sarah</firstname> <surname>Meehan</surname> <email>smeehan@redhat."
"com</email>"
msgstr ""
+"<firstname>Sarah</firstname> <surname>Meehan</surname> <email>smeehan@redhat."
+"com</email>"
+
Modified: docs/enterprise/trunk/User_Guide/ja-JP/User_Role.po
===================================================================
--- docs/enterprise/trunk/User_Guide/ja-JP/User_Role.po 2009-08-17 03:53:49 UTC (rev 13768)
+++ docs/enterprise/trunk/User_Guide/ja-JP/User_Role.po 2009-08-17 08:26:51 UTC (rev 13769)
@@ -1,23 +1,26 @@
+# translation of User_Role.po to Japanese
# Language ja-JP translations for User_Guide package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: User_Guide VERSION\n"
+"Project-Id-Version: User_Role\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:58+0000\n"
-"PO-Revision-Date: 2009-08-14 00:58+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 17:19+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: User_Role.xml:6
#, no-c-format
msgid "Administration - Users and Roles"
-msgstr ""
+msgstr "管理：ユーザーとロール"
#. Tag: para
#: User_Role.xml:7
@@ -32,12 +35,19 @@
"change between user and role management by clicking on the corresponding "
"links in the top of the portlet."
msgstr ""
+"この章では、ユーザー管理 Portlet によって利用できる管理者の機能を説明 "
+"しています。エンドユーザーの操作には、<xref linkend="
+"\"Portal_User_Guide-Home_Page-Intro_user_portlet\"/> をご覧下さい。 "
+"管理用機能は、適切な信任状（admin/admin）でログインした時に使用可能となり、 "
+"<xref linkend=\"Portal_User_Guide-JBoss_Portal_Basics-Admin_Portal\"/> に "
+"進んでから、Members Page タブへと進みます。ユーザー管理とロール管理は "
+"Portlet 上部にある該当するリンクをクリックすることで切り替えできます。"
#. Tag: title
#: User_Role.xml:18
#, no-c-format
msgid "Managing Users"
-msgstr ""
+msgstr "ユーザーの管理"
#. Tag: para
#: User_Role.xml:20
@@ -48,6 +58,9 @@
"default. For role management please see <xref linkend=\"Portal_User_Guide-"
"User_Role-Managing_Roles\"/>."
msgstr ""
+"このセクションは <classname>IdentityUserManagementPortlet</classname> の "
+"ユーザー管理を説明しています。これはデフォルトで表示されます。ロール管理には、 "
+"<xref linkend=\"Portal_User_Guide-User_Role-Managing_Roles\"/> をご覧下さい。"
#. Tag: para
#: User_Role.xml:29
@@ -56,12 +69,14 @@
"The Members page in the <xref linkend=\"Portal_User_Guide-"
"JBoss_Portal_Basics-Admin_Portal\"/>."
msgstr ""
+"<xref linkend=\"Portal_User_Guide-"
+"JBoss_Portal_Basics-Admin_Portal\"/> 内のユーザーのページ"
#. Tag: title
#: User_Role.xml:37 User_Role.xml:207
#, no-c-format
msgid "Actions"
-msgstr ""
+msgstr "アクション"
#. Tag: para
#: User_Role.xml:39
@@ -77,18 +92,26 @@
"portlet. The <emphasis>Admin subscription mode</emphasis> represents the "
"mode used in the User management portlet."
msgstr ""
+"ユーザー管理 Portlet の最初のページはユーザー関連のアクションをいくつか "
+"（例：ユーザーの検索、及び新規ユーザーアカウントの作成など）と追加の情報 "
+"（例：登録済みユーザーとサブスクリプションモードなど）を一部表示します。 "
+"登録済みのユーザーとは全ての登録済みユーザーの総数であり、サブスクリプションモードは "
+"ユーザーの登録のために必要なタスク（例：最初に電子メールの妥当性確認、その後管理者からの "
+"認可）を説明しています。<emphasis>サブスクリプションモード Subscription mode</emphasis> は "
+"ユーザー Portlet 内で使用されるモードを示するものです。<emphasis>管理サブスクリプションモード "
+"Admin subscription mode</emphasis> はユーザー管理 Portlet 内で使用されるモードを示します。"
#. Tag: para
#: User_Role.xml:49
#, no-c-format
msgid "The User management portlet."
-msgstr ""
+msgstr "ユーザー管理の Portlet"
#. Tag: title
#: User_Role.xml:57
#, no-c-format
msgid "Searching for Users"
-msgstr ""
+msgstr "ユーザーを検索"
#. Tag: para
#: User_Role.xml:58
@@ -98,18 +121,21 @@
"emphasis> and then type a partial username in the form text field. This will "
"search for usernames that match that criteria."
msgstr ""
+"ユーザーを検索するには、リンク <emphasis role=\"bold\">Search users</"
+"emphasis> をクリックして、それからテキストフィールド内に名前の一部を入力します。 "
+"これがその基準に一致するユーザー名を検出します。"
#. Tag: para
#: User_Role.xml:67
#, no-c-format
msgid "The search users page."
-msgstr ""
+msgstr "ユーザー検索のページ"
#. Tag: title
#: User_Role.xml:77
#, no-c-format
msgid "Updating User Profiles"
-msgstr ""
+msgstr "ユーザープロフィールの更新"
#. Tag: para
#: User_Role.xml:78
@@ -119,18 +145,21 @@
"search page will allow you to edit a user's profile data, and even reset his "
"password."
msgstr ""
+"検索ページの <emphasis role=\"bold\">Edit user</emphasis> リンクをクリック "
+"すると、ユーザープロフィールの編集が可能になりそのユーザーのパスワードも "
+"リセットが可能になります。"
#. Tag: para
#: User_Role.xml:88
#, no-c-format
msgid "Editing a users profile."
-msgstr ""
+msgstr "ユーザープロフィールの編集"
#. Tag: title
#: User_Role.xml:98
#, no-c-format
msgid "Updating User Roles"
-msgstr ""
+msgstr "ユーザーロールの更新"
#. Tag: para
#: User_Role.xml:101
@@ -139,18 +168,20 @@
"Clicking on the <emphasis role=\"bold\">Roles</emphasis> link in the search "
"page allows you to modify the roles a specific user belongs to."
msgstr ""
+"検索ページの <emphasis role=\"bold\">Roles</emphasis> リンクをクリックすると、 "
+"特定のユーザーが所属するロールの修正が可能になります。"
#. Tag: para
#: User_Role.xml:111
#, no-c-format
msgid "Assign roles to a user."
-msgstr ""
+msgstr "ロールをユーザーへ割り当て"
#. Tag: title
#: User_Role.xml:121
#, no-c-format
msgid "Creating Users"
-msgstr ""
+msgstr "ユーザーの作成"
#. Tag: para
#: User_Role.xml:122
@@ -160,18 +191,20 @@
"on the main UserPortlet view, allows administrators to instantly create new "
"users."
msgstr ""
+"主要な UserPortlet 表示にある <emphasis role=\"bold\">Create User Account</emphasis> "
+"リンクをクリックすることで、管理者がすぐに新規のユーザーを作成できるようになります。"
#. Tag: para
#: User_Role.xml:132
#, no-c-format
msgid "Creating a user in the User management portlet."
-msgstr ""
+msgstr "ユーザー管理 Portlet 内でユーザーの作成"
#. Tag: title
#: User_Role.xml:143
#, no-c-format
msgid "Pending Users"
-msgstr ""
+msgstr "ユーザーの保留"
#. Tag: para
#: User_Role.xml:146
@@ -182,12 +215,17 @@
"approve or reject each user by clicking on the corresponding action or click "
"on <emphasis>select all</emphasis> to approve or reject all selected users."
msgstr ""
+"<emphasis role=\"bold\">Show pending registrations</emphasis> リンクをクリックすると、 "
+"妥当性確認を受けた電子メールアドレスを持つ全ての登録を表示することができます。各ユーザーを "
+"認可、又は否定するにはその該当するアクションをクリックするか、又は <emphasis>select all "
+"</emphasis> をクリックして全ての選択済みユーザーを認可する，又は、否定することができます。"
+" "
#. Tag: para
#: User_Role.xml:159
#, no-c-format
msgid "Approve or reject pending registrations."
-msgstr ""
+msgstr "保留中の登録の認可と拒否"
#. Tag: para
#: User_Role.xml:167
@@ -198,12 +236,16 @@
"role=\"bold\">Show pending registrations</emphasis> will only be displayed "
"if a user needs to be approved by the administrator."
msgstr ""
+"デフォルトでは、サブスクリプションモードは <emphasis>automatic（自動）</emphasis> に "
+"セットしてあり、ユーザーは自動的に作成されます。更には、<emphasis "
+"role=\"bold\">Show pending registrations</emphasis> へのリンクは、ユーザーが "
+"管理者に認可を受ける必要がある場合にのみ表示されます。"
#. Tag: title
#: User_Role.xml:179
#, no-c-format
msgid "Managing Roles"
-msgstr ""
+msgstr "管理ロール"
#. Tag: para
#: User_Role.xml:181
@@ -214,12 +256,15 @@
"on the <emphasis role=\"bold\">role management</emphasis> link in the User "
"management portlet."
msgstr ""
+"ユーザー管理 Portlet 内で <emphasis role=\"bold\">role management</emphasis> "
+"リンクをクリックする時、ユーザー管理 Portlet は以前に説明してあるように、ログインした後に "
+"アクセス可能となるロールの作成や編集の任務も持ちます。"
#. Tag: title
#: User_Role.xml:187
#, no-c-format
msgid "Introduction"
-msgstr ""
+msgstr "導入"
#. Tag: para
#: User_Role.xml:189
@@ -228,12 +273,14 @@
"A role will be used to grant different permission levels to different "
"portlets, pages, or portal instances. A user can have several roles."
msgstr ""
+"ロールは、異なる権限レベルを異なる portlet、page、あるいは portal インスタンスに "
+"認可する為に使用されます。１人のユーザーが数種のロールを持つことも出来ます。"
#. Tag: para
#: User_Role.xml:198
#, no-c-format
msgid "Role management."
-msgstr ""
+msgstr "ロール管理"
#. Tag: para
#: User_Role.xml:209
@@ -242,12 +289,14 @@
"The User management portlet also provides several actions related to role "
"management, which are described in the following sections."
msgstr ""
+"ユーザー管理 Portlet はロール管理に関連した幾つかのアクションも提供します。 "
+"これは以下のセクションで説明してあります。"
#. Tag: title
#: User_Role.xml:216
#, no-c-format
msgid "Creating Roles"
-msgstr ""
+msgstr "ロールの作成"
#. Tag: para
#: User_Role.xml:218
@@ -263,12 +312,20 @@
"name for the display name <literal>Administrators</literal> , changing the "
"display name will not affect the security rules."
msgstr ""
+"新規ロールの作成は、portlet 内の <emphasis role=\"bold\">Create new role</emphasis> "
+"リンクを最初にクリックすることで達成します。<mediaobject> "
+"<imageobject> <imagedata fileref=\"images/role/create_role.png\" format=\"PNG"
+"\" scalefit=\"1\"/> </imageobject> <caption> <para> Create a new role. </"
+"para> </caption> </mediaobject> 新規ロールを１つ作成するには、参照用に使用される "
+"短い名前とユーザーへの表示用の表示名を定義します。例えば、<literal>admin</literal> は "
+"表示名 <literal>Administrators</literal> 用に適切でしょう。表示名の変更はセキュリティ "
+"ルールに影響しません。"
#. Tag: title
#: User_Role.xml:245
#, no-c-format
msgid "Edit a role"
-msgstr ""
+msgstr "ロールの編集"
#. Tag: para
#: User_Role.xml:247
@@ -281,12 +338,18 @@
"para> </caption> </mediaobject> While editing a role, you just need to pick "
"an existing role then change the display name."
msgstr ""
+"ロールの編集は編集したいロールの列にある <emphasis role=\"bold\">Edit "
+"role</emphasis> をクリックすることで達成します。<mediaobject> "
+"<imageobject> <imagedata fileref=\"images/role/edit_role.png\" format=\"PNG"
+"\" scalefit=\"1\"/> </imageobject> <caption> <para> Edit an existing role. </"
+"para> </caption> </mediaobject> ロールを編集する時は、既存のロールを選び出して "
+"それから表示名を変更するだけです。"
#. Tag: title
#: User_Role.xml:265
#, no-c-format
msgid "Editing Role Members"
-msgstr ""
+msgstr "ロールメンバーの編集"
#. Tag: para
#: User_Role.xml:267
@@ -300,12 +363,19 @@
"</caption> </mediaobject> Allows for an administrator to search and modify "
"the members' assigned roles."
msgstr ""
+"ロールメンバーの編集は、先ず修正したいロール用のロール管理ページで <emphasis role="
+"\"bold\">Members</emphasis> リンクをクリックすることで達成します。"
+"<mediaobject> <imageobject> <imagedata fileref="
+"\"images/role/role_members.png\" format=\"PNG\" scalefit=\"1\"/> </"
+"imageobject> <caption> <para> Show the members of an existing role. </para> "
+"</caption> </mediaobject> は管理者がロールに割り当てられたメンバーの検索と修正を "
+"できるようにします。"
#. Tag: title
#: User_Role.xml:289
#, no-c-format
msgid "Deleting Roles"
-msgstr ""
+msgstr "ロールの削除"
#. Tag: para
#: User_Role.xml:291
@@ -314,3 +384,6 @@
"Deleting roles is accomplished by clicking the <emphasis role=\"bold"
"\">Delete</emphasis> link for the role you would like to remove."
msgstr ""
+"ロールの削除は、削除したいロール用の <emphasis role=\"bold"
+"\">Delete</emphasis> リンクをクリックすることで達成できます。"
+
14 years, 9 months
- 1
- 0
JBoss Portal SVN: r13768 - docs/enterprise/trunk/Read_Me/ja-JP.
by portal-commits＠lists.jboss.org
Author: khashida(a)redhat.com
Date: 2009-08-16 23:53:49 -0400 (Sun, 16 Aug 2009)
New Revision: 13768
Modified:
docs/enterprise/trunk/Read_Me/ja-JP/Author_Group.po
docs/enterprise/trunk/Read_Me/ja-JP/Book_Info.po
docs/enterprise/trunk/Read_Me/ja-JP/Release_Notes_GA.po
docs/enterprise/trunk/Read_Me/ja-JP/Revision_History.po
Log:
translation done
Modified: docs/enterprise/trunk/Read_Me/ja-JP/Author_Group.po
===================================================================
--- docs/enterprise/trunk/Read_Me/ja-JP/Author_Group.po 2009-08-14 15:02:49 UTC (rev 13767)
+++ docs/enterprise/trunk/Read_Me/ja-JP/Author_Group.po 2009-08-17 03:53:49 UTC (rev 13768)
@@ -1,20 +1,24 @@
+# translation of Author_Group.po to Japanese
# Language ja-JP translations for Release_Notes_GA package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: Release_Notes_GA VERSION\n"
+"Project-Id-Version: Author_Group\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:47+0000\n"
-"PO-Revision-Date: 2009-08-14 00:47+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 09:41+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: corpauthor
#: Author_Group.xml:5
#, no-c-format
msgid "Red Hat"
-msgstr ""
+msgstr "Red Hat"
+
Modified: docs/enterprise/trunk/Read_Me/ja-JP/Book_Info.po
===================================================================
--- docs/enterprise/trunk/Read_Me/ja-JP/Book_Info.po 2009-08-14 15:02:49 UTC (rev 13767)
+++ docs/enterprise/trunk/Read_Me/ja-JP/Book_Info.po 2009-08-17 03:53:49 UTC (rev 13768)
@@ -1,29 +1,32 @@
+# translation of Book_Info.po to Japanese
# Language ja-JP translations for Release_Notes_GA package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: 0\n"
+"Project-Id-Version: Book_Info\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:47+0000\n"
-"PO-Revision-Date: 2009-08-14 00:47+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 09:46+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Book_Info.xml:6
#, no-c-format
msgid "Release Notes GA"
-msgstr ""
+msgstr "リリースノート GA"
#. Tag: subtitle
#: Book_Info.xml:7
#, no-c-format
msgid "for Use with JBoss Enterprise Portal Platform 4.3"
-msgstr ""
+msgstr "JBoss Enterprise Portal Platform 4.3 対応"
#. Tag: para
#: Book_Info.xml:13
@@ -34,9 +37,14 @@
"Product Manuals. You should read these Release Notes in their entirety "
"before installing JBoss Enterprise Portal Platform 4.3."
msgstr ""
+"このリリースノートには、製品マニュアルでは現在入手できないかも知れない "
+"JBoss Enterprise Portal Platform 4.3 関連の重要な情報が収納されています。 "
+"JBoss Enterprise Portal Platform 4.3 をインストールする前に、このリリース "
+"ノートの全域を読み通して下さい。"
#. Tag: holder
#: Book_Info.xml:27
#, no-c-format
msgid "&HOLDER;"
-msgstr ""
+msgstr "&HOLDER;"
+
Modified: docs/enterprise/trunk/Read_Me/ja-JP/Release_Notes_GA.po
===================================================================
--- docs/enterprise/trunk/Read_Me/ja-JP/Release_Notes_GA.po 2009-08-14 15:02:49 UTC (rev 13767)
+++ docs/enterprise/trunk/Read_Me/ja-JP/Release_Notes_GA.po 2009-08-17 03:53:49 UTC (rev 13768)
@@ -1,23 +1,26 @@
+# translation of Release_Notes_GA.po to Japanese
# Language ja-JP translations for Release_Notes_GA package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: Release_Notes_GA VERSION\n"
+"Project-Id-Version: Release_Notes_GA\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:47+0000\n"
-"PO-Revision-Date: 2009-08-14 00:47+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 12:07+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Release_Notes_GA.xml:9
#, no-c-format
msgid "Introduction"
-msgstr ""
+msgstr "はじめに"
#. Tag: para
#: Release_Notes_GA.xml:12
@@ -27,12 +30,15 @@
"Enterprise Portal Platform &VERSION;. New features, known problems, "
"resources, and other current issues are addressed here."
msgstr ""
+"このリリースノートには JBoss Enterprise Portal Platform &VERSION; に関する "
+"重要な情報が収納されています。新しい機能、既知の問題、リソース、及び他の "
+"現在の問題についてここで説明してあります。"
#. Tag: title
#: Release_Notes_GA.xml:16
#, no-c-format
msgid "Overview"
-msgstr ""
+msgstr "概要"
#. Tag: para
#: Release_Notes_GA.xml:17
@@ -49,6 +55,15 @@
"application platform ensuring performance, scalability, and a reliable and "
"straightforward path to implementation."
msgstr ""
+"JBoss Enterprise Portal Platform はウェブベースの複合アプリケーションと "
+"ハイパフォーマンスのウェブ提供の配信を促進します。その俊敏で再利用可能なフレーム "
+"ワークを通じて、お客様は自身のウェブインフラストラクチャのコストと複雑性を "
+"低減できます。オープンソース基準の使用はベンダー専従のリスクを軽減して、互換性を "
+"確保します。JBoss Enterprise Middleware の統合的コンポーネンツとして、広域に及ぶ "
+"活発な JBoss.org の開発者コミュニティがその継続的改革とエンタープライズ級の品質を "
+"育みます。そしてこれは 業界でNO.１ の J2EE 認定のアプリケーションプラットフォーム "
+"である JBoss Enterprise Application Platform 上でデプロイされており、パフォーマンス、 "
+"拡張性、及び信頼性と、実装への単純な工程を確保しています。"
#. Tag: para
#: Release_Notes_GA.xml:20
@@ -58,6 +73,9 @@
"source enterprise software. It is a powerful tool for developing rich, high "
"performance, Web 2.0 applications on a pure Java Platform."
msgstr ""
+"JBoss Enterprise Application Platform はオープンソースエンタープライズソフトウェア "
+"に於ける次世代の発展段階です。純粋な Java プラットフォーム上での豊かでハイパフォーマンスの "
+"Web 2.0 アプリケーションを開発する為の強力なツールです。"
#. Tag: para
#: Release_Notes_GA.xml:23
@@ -70,6 +88,11 @@
"advantage of the Java EE 5.0's significantly simpler POJO-based programming "
"model."
msgstr ""
+"JBoss Enterprise Application Platform は、既存の J2EE 1.4 エンタープライズ "
+"Java アプリケーションとの完全な互換性を提供します。それと同時に Java EE 5.0 仕様で "
+"定義されている殆ど全ての基幹機能がサポートされています。そのため、新しいエンタープライズ "
+"Java アプリケーションは。Java EE 5.0 のより単純な POJO ベースのプログラミングモデルの "
+"利便性をすぐに利用できます。"
#. Tag: para
#: Release_Notes_GA.xml:26
@@ -81,6 +104,11 @@
"Application Platform is fully tested and supported by Red Hat, and is "
"certified to work on many leading enterprise hardware and software products."
msgstr ""
+"更には、JBoss Seam、Hibernate、Tomcat、及び JBoss Cache などのオープンソースの "
+"精鋭フレームワークを統合することにより、この Platform はオープンソースコミュニティの "
+"改革の利便性を活用します。そして JBoss Enterprise Application Platform は Red Hat に "
+"より全面的にテストがなされてサポートされており、多くの先導的エンタープライズ用ハードウェアと "
+"ソフトウェア製品上で機能することの認定を受けています。"
#. Tag: para
#: Release_Notes_GA.xml:29
@@ -90,18 +118,22 @@
"Java EE 5.0 technologies immediately and with the confidence of knowing it "
"will remain forward-compatible with future versions of the JBoss Platform."
msgstr ""
+"このことの全ては、ユーザーが自身の新しいアプリケーションを開発して、すぐに "
+"Java EE 5.0 技術の利便性を利用することができて、更にそれが JBoss Platform の "
+"将来のバージョンとの上方互換性を維持することを知る確信を持つことができることを "
+"意味します。"
#. Tag: title
#: Release_Notes_GA.xml:35
#, no-c-format
msgid "New Features in JBoss Enterprise Portal Platform 4.3"
-msgstr ""
+msgstr "JBoss Enterprise Portal Platform 4.3 の新しい機能"
#. Tag: title
#: Release_Notes_GA.xml:37
#, no-c-format
msgid "Portlet 2.0 - JSR 286"
-msgstr ""
+msgstr "Portlet 2.0 - JSR 286"
#. Tag: para
#: Release_Notes_GA.xml:38
@@ -111,12 +143,15 @@
"Portlet 2.0 specification which enables Inter Portlet Communication by "
"sharing parameters and event support."
msgstr ""
+"Enterprise Portal Platform の主な改善は Portlet 2.0 仕様のサポートです。 "
+"これは、パラメータとイベントサポートを共有することにより Inter Portlet Communication "
+"（相互 Portlet 交信）を可能にします。"
#. Tag: title
#: Release_Notes_GA.xml:44
#, no-c-format
msgid "Component Versions"
-msgstr ""
+msgstr "コンポーネンツのバージョン"
#. Tag: para
#: Release_Notes_GA.xml:45
@@ -126,42 +161,45 @@
"Enterprise Portal Platform 4.3 that can be found in release on top of the "
"components delivered by the Enterprise Application Platform 4.3.CP03."
msgstr ""
+"このセクションでは、Enterprise Portal Platform 4.3 を構成するコンポーネンツの "
+"バージョンの詳細を示します。これらのコンポーネンツは Enterprise Application Platform 4.3.CP03 "
+"で配布されるコンポーネンツの最上部のリリースで見ることができます。"
#. Tag: para
#: Release_Notes_GA.xml:50
#, no-c-format
msgid "Identity Module 1.1.0"
-msgstr ""
+msgstr "Identity Module 1.1.0"
#. Tag: para
#: Release_Notes_GA.xml:55
#, no-c-format
msgid "Common Module 1.2.5"
-msgstr ""
+msgstr "Common Module 1.2.5"
#. Tag: para
#: Release_Notes_GA.xml:60
#, no-c-format
msgid "Portlet Module 2.0.8"
-msgstr ""
+msgstr "Portlet Module 2.0.8"
#. Tag: para
#: Release_Notes_GA.xml:65
#, no-c-format
msgid "Web Module 1.2.3"
-msgstr ""
+msgstr "Web Module 1.2.3"
#. Tag: para
#: Release_Notes_GA.xml:70
#, no-c-format
msgid "CMS Module 1.2.6"
-msgstr ""
+msgstr "CMS Module 1.2.6"
#. Tag: para
#: Release_Notes_GA.xml:74
#, no-c-format
msgid "JBoss Portlet Bridge 1.0.0CR2"
-msgstr ""
+msgstr "JBoss Portlet Bridge 1.0.0CR2"
#. Tag: para
#: Release_Notes_GA.xml:80
@@ -171,93 +209,96 @@
"market to a level where direct association to a community release can no "
"longer be drawn."
msgstr ""
+"Enterprise Portal Platform Server は、コミュニティリリースとの直接関連がもう不明確になる "
+"レベルまで、エンタープライズ市場の為に再定義されています。"
#. Tag: title
#: Release_Notes_GA.xml:86
#, no-c-format
msgid "Product Support and License Website Links"
-msgstr ""
+msgstr "製品サポートとライセンスのウェブサイトリンク"
#. Tag: title
#: Release_Notes_GA.xml:90
#, no-c-format
msgid "Support Processes"
-msgstr ""
+msgstr "サポートのプロセス"
#. Tag: ulink
#: Release_Notes_GA.xml:92
#, no-c-format
msgid "http://www.redhat.com/support/process/"
-msgstr ""
+msgstr "http://www.redhat.com/support/process/"
#. Tag: title
#: Release_Notes_GA.xml:97
#, no-c-format
msgid "Production Support Scope of Coverage"
-msgstr ""
+msgstr "製品サポートの範囲"
#. Tag: ulink
#: Release_Notes_GA.xml:101
#, no-c-format
msgid "http://www.redhat.com/support/policy/soc/production"
-msgstr ""
+msgstr "http://www.redhat.com/support/policy/soc/production"
#. Tag: title
#: Release_Notes_GA.xml:107
#, no-c-format
msgid "Production Support Service Level Agreement"
-msgstr ""
+msgstr "製品サポートサービスレベルの同意書"
#. Tag: ulink
#: Release_Notes_GA.xml:112
#, no-c-format
msgid "http://www.redhat.com/support/policy/sla/production/"
-msgstr ""
+msgstr "http://www.redhat.com/support/policy/sla/production/"
#. Tag: title
#: Release_Notes_GA.xml:117
#, no-c-format
msgid "Developer Support Scope of Coverage"
-msgstr ""
+msgstr "開発者サポートの範囲"
#. Tag: ulink
#: Release_Notes_GA.xml:122
#, no-c-format
msgid "http://www.redhat.com/support/policy/soc/developer/"
-msgstr ""
+msgstr "http://www.redhat.com/support/policy/soc/developer/"
#. Tag: title
#: Release_Notes_GA.xml:127
#, no-c-format
msgid "Developer Support Service Level Agreement"
-msgstr ""
+msgstr "開発者サポートサービスレベルの同意書"
#. Tag: ulink
#: Release_Notes_GA.xml:132
#, no-c-format
msgid "http://www.redhat.com/support/policy/sla/developer/"
-msgstr ""
+msgstr "http://www.redhat.com/support/policy/sla/developer/"
#. Tag: title
#: Release_Notes_GA.xml:137
#, no-c-format
msgid "Product Update and Support Policy by Product"
-msgstr ""
+msgstr "製品別の製品更新とサポートポリシー"
#. Tag: ulink
#: Release_Notes_GA.xml:142
#, no-c-format
msgid "http://www.redhat.com/security/updates/jboss_notes/"
-msgstr ""
+msgstr "http://www.redhat.com/security/updates/jboss_notes/"
#. Tag: title
#: Release_Notes_GA.xml:147
#, no-c-format
msgid "JBoss End User License Agreement"
-msgstr ""
+msgstr "JBoss エンドユーザーライセンスの同意書"
#. Tag: ulink
#: Release_Notes_GA.xml:152
#, no-c-format
msgid "http://www.redhat.com/licenses/jboss_eula.html"
-msgstr ""
+msgstr "http://www.redhat.com/licenses/jboss_eula.html"
+
Modified: docs/enterprise/trunk/Read_Me/ja-JP/Revision_History.po
===================================================================
--- docs/enterprise/trunk/Read_Me/ja-JP/Revision_History.po 2009-08-14 15:02:49 UTC (rev 13767)
+++ docs/enterprise/trunk/Read_Me/ja-JP/Revision_History.po 2009-08-17 03:53:49 UTC (rev 13768)
@@ -1,26 +1,30 @@
+# translation of Revision_History.po to Japanese
# Language ja-JP translations for Release_Notes_GA package.
+#
# Automatically generated, 2009.
-#
+# Kiyoto Hashida <khashida(a)redhat.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: Release_Notes_GA VERSION\n"
+"Project-Id-Version: Revision_History\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-08-14 00:47+0000\n"
-"PO-Revision-Date: 2009-08-14 00:47+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-08-17 09:47+0900\n"
+"Last-Translator: Kiyoto Hashida <khashida(a)redhat.com>\n"
+"Language-Team: Japanese <jp(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Revision_History.xml:6
#, no-c-format
msgid "Revision History"
-msgstr ""
+msgstr "改訂履歴"
#. Tag: author
#: Revision_History.xml:12
#, no-c-format
msgid "<firstname></firstname> <surname></surname> <email></email>"
-msgstr ""
+msgstr "<firstname></firstname> <surname></surname> <email></email>"
+
14 years, 9 months
- 1
- 0