Author: genspring
Date: Mon Dec 7 08:23:55 2009
New Revision: 887861
URL: http://svn.apache.org/viewvc?rev=887861&view=rev
Log:
GERONIMO-4977 Geronimo EN/Simp.Chinese UI information improvement for Console, thanks Jeff for the patch !
Modified:
geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties
geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties
geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties (contents, props changed)
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties Mon Dec 7 08:23:55 2009
@@ -27,27 +27,27 @@
jmsmanager.activemq.common.poolMaxCapacityExp = Maximum connection pool size.
jmsmanager.activemq.common.serverURL = Server URL
jmsmanager.activemq.common.serverURLExp = URL of the server to connect to.
-jmsmanager.activemq.common.testConn = test connection
+jmsmanager.activemq.common.testConn = Test connection
jmsmanager.activemq.common.testResult = Test Result
jmsmanager.activemq.common.userNameExp = User name to use.
jmsmanager.activemq.config.passwordsNotMatch = Passwords did not match
jmsmanager.activemq.config.repeatPassword = Repeat Password
-jmsmanager.activemq.config.serverUrl = ServerUrl
-jmsmanager.activemq.config.userName = UserName
+jmsmanager.activemq.config.serverUrl = Server Url
+jmsmanager.activemq.config.userName = User Name
jmsmanager.activemq.help.addNewJMSConnFactoryExp = This link brings up a form for adding a new connection factory. The fields are defined on the form.
-jmsmanager.activemq.help.detailExp = This link provides details on the connector. Clicking on the details link will display information about the Connection Factory in Property/Value pairs. Click on the "Back to JMS Connection Factories" button to return to the main JMS Connection Factories page.
+jmsmanager.activemq.help.detailExp = This link provides details on the connector. Click the details link to display information about the Connection Factory in Property/Value pairs. Click the "Back to JMS Connection Factories" button to return to the main JMS Connection Factories page.
jmsmanager.activemq.help.nameExp = Name of the connection factory.
jmsmanager.activemq.help.stateExp = The state of the connection, either "Running" or "Stopped."
jmsmanager.activemq.help.testConnExp = This link can be used to test the connector. A result will be returned of either "Connected" or a failure message.
jmsmanager.activemq.help.title = This portlet displays the JMS connectors that are configured with the Geronimo server.
jmsmanager.broker.cancel = Cancel
-jmsmanager.broker.confirmMsg01 = Are you sure you want to delete
-jmsmanager.broker.creationtip = Please edit the ActiveMQ XML template configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker
+jmsmanager.broker.confirmMsg01 = Are you sure that you want to delete?
+jmsmanager.broker.creationtip = Edit the ActiveMQ XML template configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker
jmsmanager.broker.emptyText = The focussed field must not be empty.
-jmsmanager.broker.emptybrokerconfig = ActiveMQ XML configuration could not be empty
-jmsmanager.broker.emptybrokername = Broker name could not be empty
+jmsmanager.broker.emptybrokerconfig = ActiveMQ XML configuration must not be empty
+jmsmanager.broker.emptybrokername = Broker name must not be empty
jmsmanager.broker.ok = OK
-jmsmanager.broker.updatetip = Please edit the ActiveMQ XML configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker.
+jmsmanager.broker.updatetip = Edit the ActiveMQ XML configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker.
jmsmanager.common.actions = Actions
jmsmanager.common.addNewDatasource = Add New Datasource
jmsmanager.common.addQueue_Topic = Add Queue/Topic
@@ -60,12 +60,12 @@
jmsmanager.common.correlationID = CorrelationID
jmsmanager.common.create = Create
jmsmanager.common.currentDepth = Current Depth
-jmsmanager.common.delete = delete
+jmsmanager.common.delete = Delete
jmsmanager.common.description = Description
jmsmanager.common.destination = Destination
jmsmanager.common.destinationPhysicalName = Destination Physical Name
-jmsmanager.common.detail = detail
-jmsmanager.common.edit = edit
+jmsmanager.common.detail = Detail
+jmsmanager.common.edit = Edit
jmsmanager.common.expiration = Expiration
jmsmanager.common.host = Host
jmsmanager.common.hostExp = The host name or IP to bind to. The normal values are <tt>0.0.0.0</tt> (all interfaces) or <tt>localhost</tt> (local connections only)
@@ -90,14 +90,14 @@
jmsmanager.common.protocol = Protocol
jmsmanager.common.refresh = Refresh
jmsmanager.common.remove = Remove
-jmsmanager.common.replyTo = ReplyTo
+jmsmanager.common.replyTo = Reply To
jmsmanager.common.reset = Reset
jmsmanager.common.save = Save
jmsmanager.common.sharable = Sharable
jmsmanager.common.start = start
jmsmanager.common.state = State
jmsmanager.common.statiscticFor = Statistic for {0}
-jmsmanager.common.stop = stop
+jmsmanager.common.stop = Stop
jmsmanager.common.submit = Submit
jmsmanager.common.testConn = test connection
jmsmanager.common.timestamp = Timestamp
@@ -105,23 +105,23 @@
jmsmanager.common.type = Type
jmsmanager.common.userName = User Name
jmsmanager.common.value = Value
-jmsmanager.common.viewDLQ = view DLQ
-jmsmanager.common.viewMessages = view messages
-jmsmanager.connectionhelp.addNewDatasourceExp = Clicking on this link allows the user to add a new datasource. On the add new datasource form, fill in the fields and click on the Create button to add the new datasource. The fields are defined on the form itself.
-jmsmanager.connectionhelp.detailExp = This link provides details on the connector. Clicking on the details link will display information about the Connection Factory in Property/Value pairs. Click on "Back to Datasources" to return to the main JMS Connection Factories page.
+jmsmanager.common.viewDLQ = View DLQ
+jmsmanager.common.viewMessages = View messages
+jmsmanager.connectionhelp.addNewDatasourceExp = Click this link to add a new datasource. On the add new datasource form, fill in the fields and click the Create button to add the new datasource. The fields are defined on the form itself.
+jmsmanager.connectionhelp.detailExp = This link provides details on the connector. Click the details link to display information about the Connection Factory in Property/Value pairs. Click on "Back to Datasources" to return to the main JMS Connection Factories page.
jmsmanager.connectionhelp.nameExp = Name of the Connection Factory.
jmsmanager.connectionhelp.stateExp = The state of the connection, either "Running" or "Stopped."
jmsmanager.connectionhelp.testConnExp = This link can be used to test the connector. A result will be returned of either "Connected" or a failure message.
jmsmanager.connectionhelp.title = This portlet displays the JMS connectors that are configured with the Geronimo server and allows the user to add datasources as well.
-jmsmanager.help.addQueue_TopicExp = To create a queue/topic click on the "Add Queue/Topic" link. This link brings up a form that allows the user to add a queue or a topic. Fill in the text boxes on the form and click on the "Submit" button. The fields and buttons on the form are defined as follows:
+jmsmanager.help.addQueue_TopicExp = To create a queue/topic, click the "Add Queue/Topic" link. This link brings up a form that allows the user to add a queue or a topic. Fill in the text boxes on the form and click the "Submit" button. The fields and buttons on the form are defined as follows:
jmsmanager.help.applicationNameExp = This is the "configID" in the geronimo-web.xml file. Or this can be set to the string "null" if the admin object is deployed stand-alone. By default this field contains the string "null."
jmsmanager.help.backBtnExp = The Back button returns the user to the "JMS Destination Manager" main page without adding a queue or a topic.
jmsmanager.help.clearBtnExp = The Clear button resets all input fields to the default values.
jmsmanager.help.destinationPhysicalNameExp = The name of the connection factory that ActiveMQ knows about.
jmsmanager.help.messageDestinationNameExp = The name of the queue or topic. This is the name used in the admin object gbean name and is linked to by <message-destination-link> in the geronimo-web.xml plan.
-jmsmanager.help.moduleNameExp = If the module is deployed stand-alone this field is the "configID" in the geronimo-web.xml file. If it is deployed in an application (ear) this field should be the path of the module inside the ear, such as, myResourceAdapter.rar. By default this field contains "defaultJMS."
+jmsmanager.help.moduleNameExp = If the module is deployed stand-alone, this field is the "configID" in the geronimo-web.xml file. If it is deployed in an application (ear), this field should be the path of the module inside the ear, such as, myResourceAdapter.rar. By default this field contains "defaultJMS."
jmsmanager.help.submitBtnExp = The Submit button creates a new queue or topic and returns the user to the JMS Destination Manager main page.
-jmsmanager.help.summary = <p>On the main JMS Destination Manager pane, there is an "Actions" column that provides three actions which can be performed on a queue or topic. To remove a queue or topic, click on the "remove" link to the right of the queue/topic to be removed. To view a message, click on the "view messages" link to the right of the queue/topic. To view the dead letter queue, click on the "view DLQ" link.</p><p> <strong>Note:</strong> Queues/Topics with no messages will be removed after restarting the server.</p>
+jmsmanager.help.summary = <p>On the main JMS Destination Manager pane, there is an "Actions" column that provides three actions which can be performed on a queue or topic. To remove a queue or topic, click the "remove" link to the right of the queue/topic to be removed. To view a message, click the "view messages" link to the right of the queue/topic. To view the dead letter queue, click the "view DLQ" link.</p><p> <strong>Note:</strong> Queues/Topics with no messages will be removed after restarting the server.</p>
jmsmanager.help.title = This portlet is used to create and remove queues/topics.
jmsmanager.help.typeExp = The type of message, either queue or topic.
jmsmanager.sendmessage.correlationId = JMS Correlation ID
@@ -137,9 +137,9 @@
jmsmanager.sendmessage.type = Type
jmsmanager.server.connector.editGeneric.addJMSConnector = Add new {0} connector for {1}
jmsmanager.server.connector.editGeneric.editJMSConnector = Edit {0} connector {1} for {2}.
-jmsmanager.server.connector.editGeneric.namingJMSConnectors = A name that is different than the name for any other JMS connectors in the server
+jmsmanager.server.connector.editGeneric.namingJMSConnectors = A name that is different from the name for any other JMS connectors in the server
jmsmanager.server.connector.editGeneric.uniqueName = Unique Name
-jmsmanager.server.connector.editGeneric.uniqueNameExp = A name that is different than the name for any other JMS connectors in the server
+jmsmanager.server.connector.editGeneric.uniqueNameExp = A name that is different from the name for any other JMS connectors in the server
jmsmanager.server.connector.help.title = Shows all the network connectors configured for the currently available JMS brokers. Lets you start, stop, add, remove, and edit JMS network connectors.
jmsmanager.server.connector.normal.addConnectorTo = Add connector to {0}
jmsmanager.server.connector.normal.addNewParaListener = Add new <b>{0}</b> listener
@@ -206,7 +206,7 @@
jmswizard.list.serverWide = Server-wide
jmswizard.list.title = This page lists all the available JMS Resource Groups.
jmswizard.plan.JMSProviderRAR = JMS Provider RAR
-jmswizard.plan.JMSProviderRARExp = The Resource Adapter RAR that can be used to connect to the JMS provider in question. This RAR should be installed under GERONIMO/repository/ in order for it to appear in this list.
+jmswizard.plan.JMSProviderRARExp = The Resource Adapter RAR that can be used to connect to the JMS provider in question. This RAR must be installed under GERONIMO/repository/ in order for it to appear in this list.
jmswizard.plan.addToEAR = Add to EAR
jmswizard.plan.addToEARExp = Instead of deploying as a top-level JMS resource, you can deploy this pool as part of an EAR. To add a JMS resource to an EAR using this plan:<ol> <li>Copy and paste the plan to a file</li> <li>Save the plan file to the top level of your EAR</li> <li>Copy the RAR file from <tt>{0}</tt> to the top level of your EAR</li> <li>Create a <tt>META-INF/geronimo-application.xml</tt> file in your EAR that has a <tt>module</tt> entry like this (substituting the correct RAR file name and plan file name):</li></ol>
jmswizard.plan.deployCommand = Deploy Command
@@ -218,7 +218,7 @@
jmswizard.provider.JMSProviderRAR = JMS Provider RAR
jmswizard.provider.JMSProviderRARExp = The Resource Adapter RAR that can be used to connect to the JMS provider in question. This RAR should be installed under GERONIMO/repository/ in order for it to appear in this list.
jmswizard.provider.title = <b>JMS Resource Group</b> -- Select JMS Provider RAR
-jmswizard.raInstance.BrokerXmlConfig = Sets the XML configuration file used to configure the embedded ActiveMQ broker via Spring if using embedded mode.<br>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas file:dir/file.xml would use the file system. Any valid URL string is supported.
+jmswizard.raInstance.BrokerXmlConfig = Sets the XML configuration file used to configure the embedded ActiveMQ broker by Spring if using embedded mode.<br>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas file:dir/file.xml would use the file system. Any valid URL string is supported.
jmswizard.raInstance.Clientid = The client id that will be set on the connection that is established to the ActiveMQ server.
jmswizard.raInstance.Password = The default password that will be used to log the default user into the ActiveMQ server.
jmswizard.raInstance.ServerUrl = The URL to the ActiveMQ server that you want this connection to connect to. If using an embedded broker, this value should be 'vm://localhost'.
@@ -232,8 +232,8 @@
jmswizard.status.addConnFactory = Add Connection Factory
jmswizard.status.addDestination = Add Destination
jmswizard.status.deployNow = Deploy Now
-jmswizard.status.factoriesDestinationsAdded = These are the connection factories and destinations you've added to the JMS resource group so far. When you're finished adding connection factories and destinations, you can review the Geronimo deployment plan for this resource group, or go ahead and deploy it.
-jmswizard.status.noFactoriesDestinations = So far, you've entered the basic configuration information required for a JMS resource group. Now you can create connection factories and destinations. When you're finished adding connection factories and destinations, you can review the Geronimo deployment plan for this JMS resource group, or go ahead and deploy it.
+jmswizard.status.factoriesDestinationsAdded = These are the connection factories and destinations you've added to the JMS resource group so far. When you've finished adding connection factories and destinations, you can review the Geronimo deployment plan for this resource group, or go ahead and deploy it.
+jmswizard.status.noFactoriesDestinations = So far, you've entered the basic configuration information required for a JMS resource group. Now you can create connection factories and destinations. When you've finished adding connection factories and destinations, you can review the Geronimo deployment plan for this JMS resource group, or go ahead and deploy it.
jmswizard.status.resourceGroup = Resource Group
jmswizard.status.showPlan = Show Plan
jmswizard.status.title = <b>JMS Resource Group</b> -- Current Progress
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties Mon Dec 7 08:23:55 2009
@@ -16,8 +16,8 @@
# limitations under the License.
#=====================================================================
-jmsmanager.activemq.addACF.nameExp = 该ActiveMQè¿æ¥å·¥åçå称
-jmsmanager.activemq.common.addNewJMSConnFactory = æ·»å æ°çJMSè¿æ¥å·¥å
+jmsmanager.activemq.addACF.nameExp = 该 ActiveMQ è¿æ¥å·¥åçå称
+jmsmanager.activemq.common.addNewJMSConnFactory = æ·»å æ°ç JMS è¿æ¥å·¥å
jmsmanager.activemq.common.blockingTimeout = å µå¡è¶
æ¶(毫ç§)
jmsmanager.activemq.common.blockingTimeoutExp = å µå¡è¶
æ¶(毫ç§)
jmsmanager.activemq.common.connName = è¿æ¥å称
@@ -25,23 +25,23 @@
jmsmanager.activemq.common.passwordExp = 对åºç¨æ·åçå¯ç
jmsmanager.activemq.common.poolMaxCapacity = è¿æ¥æ± æ大è¿æ¥æ°
jmsmanager.activemq.common.poolMaxCapacityExp = è¿æ¥æ± æ大è¿æ¥æ°
-jmsmanager.activemq.common.serverURL = æå¡å¨URL
+jmsmanager.activemq.common.serverURL = æå¡å¨ URL
jmsmanager.activemq.common.serverURLExp = è¿æ¥æå¡å¨çå°å
jmsmanager.activemq.common.testConn = æµè¯è¿æ¥
jmsmanager.activemq.common.testResult = æµè¯ç»æ
jmsmanager.activemq.common.userNameExp = 使ç¨çç¨æ·å
jmsmanager.activemq.config.passwordsNotMatch = å¯ç ä¸å¹é
jmsmanager.activemq.config.repeatPassword = 确认å¯ç
-jmsmanager.activemq.config.serverUrl = æå¡å¨URL
+jmsmanager.activemq.config.serverUrl = æå¡å¨ URL
jmsmanager.activemq.config.userName = ç¨æ·å
-jmsmanager.activemq.help.addNewJMSConnFactoryExp = 该è¿æ¥ç¨äºæå¼æ·»å æ°è¿æ¥å·¥åç表å
-jmsmanager.activemq.help.detailExp = 该é¾æ¥æä¾è¿æ¥å¨ç详ç»ä¿¡æ¯, ç¹å»è¯¥é¾æ¥ä¼ä»¥å±æ§åå对åºå¼çæ¹å¼æ¾ç¤ºè¿æ¥å·¥åçä¿¡æ¯. ç¹å»"è¿åJMSè¿æ¥å·¥å"æé®å°è¿åJMSå·¥åå表页é¢
+jmsmanager.activemq.help.addNewJMSConnFactoryExp = 该é¾æ¥ç¨äºæå¼æ·»å æ°è¿æ¥å·¥åç表å
+jmsmanager.activemq.help.detailExp = 该é¾æ¥æä¾è¿æ¥å¨ç详ç»ä¿¡æ¯, ç¹å»è¯¥é¾æ¥ä¼ä»¥å±æ§åå对åºå¼çæ¹å¼æ¾ç¤ºè¿æ¥å·¥åçä¿¡æ¯. ç¹å»"è¿å JMS è¿æ¥å·¥å"æé®å°è¿å JMS å·¥åå表页é¢
jmsmanager.activemq.help.nameExp = è¿æ¥å·¥åçå称
jmsmanager.activemq.help.stateExp = è¿æ¥çç¶æ,å
å«"è¿è¡"å"åæ¢"ç¶æ
-jmsmanager.activemq.help.testConnExp = 该è¿æ¥ç¨äºæµè¯è¿æ¥å¨, å°è¿å"æåè¿æ¥"æè
ä¸ä¸ªé误信æ¯ã
-jmsmanager.activemq.help.title = 该Portletæ¾ç¤ºå¨Geronimoæå¡å¨ä¸é
ç½®çJMSè¿æ¥å¨
+jmsmanager.activemq.help.testConnExp = 该é¾æ¥ç¨äºæµè¯è¿æ¥å¨, å°è¿å"æåè¿æ¥"æè
ä¸ä¸ªé误信æ¯ã
+jmsmanager.activemq.help.title = 该 Portle tæ¾ç¤ºå¨ Geronimo æå¡å¨ä¸é
ç½®ç JMS è¿æ¥å¨
jmsmanager.broker.cancel = åæ¶
-jmsmanager.broker.confirmMsg01 = ä½ ç¡®å®è¦å é¤
+jmsmanager.broker.confirmMsg01 = ä½ ç¡®å®è¦å é¤?
jmsmanager.broker.creationtip = 请ç¼è¾ä¸é¢ç¼è¾æ¡ä¸ç ActiveMQ XML 模æ¿é
ç½®æ件, ç¶åç¹å»ä¿åæé®ä¿åä¿®æ¹å¹¶é¨ç½²è¯¥ Broker
jmsmanager.broker.emptyText = ç¦ç¹æå¨å段ä¸è½ä¸ºç©ºã
jmsmanager.broker.emptybrokerconfig = ActiveMQ XML é
ç½®ä¸å¯ä¸ºç©º
@@ -68,15 +68,15 @@
jmsmanager.common.edit = ç¼è¾
jmsmanager.common.expiration = æªæ¢
jmsmanager.common.host = 主æº
-jmsmanager.common.hostExp = è¦ç»å®å°ç主æºå称æè
IPå°åãé常å¼ä¸º<tt>0.0.0.0</tt> (all interfaces) æè
<tt>localhost</tt> ï¼åªç¨äºæ¬æºè¿æ¥ï¼
+jmsmanager.common.hostExp = è¦ç»å®å°ç主æºå称æè
IP å°åãé常å¼ä¸º<tt>0.0.0.0</tt> (all interfaces) æè
<tt>localhost</tt> ï¼åªç¨äºæ¬æºè¿æ¥ï¼
jmsmanager.common.inhibitGet = ç¦æ¢ Get
jmsmanager.common.inhibitPut = ç¦æ¢ Put
-jmsmanager.common.listJMSConnectors = ååºJMSè¿æ¥å¨
+jmsmanager.common.listJMSConnectors = ååº JMS è¿æ¥å¨
jmsmanager.common.maximumDepth = æ大深度
jmsmanager.common.maximumMessageLength = æ¶æ¯æ大é¿åº¦
jmsmanager.common.message = æ¶æ¯
jmsmanager.common.messageDestinationName = æ¶æ¯ç®çå°å称
-jmsmanager.common.messageID = æ¶æ¯ID
+jmsmanager.common.messageID = æ¶æ¯ ID
jmsmanager.common.moduleName = 模åå
jmsmanager.common.name = å称
jmsmanager.common.openInputCount = Open Input Count
@@ -108,19 +108,19 @@
jmsmanager.common.viewDLQ = æ¥ç DLQ
jmsmanager.common.viewMessages = æ¥çæ¶æ¯
jmsmanager.connectionhelp.addNewDatasourceExp = ç¹å»è¯¥é¾æ¥å
许ç¨æ·æ·»å æ°çæ°æ®æº. å¨æ°æ®æºæ·»å 表åä¸, å¡«åè¾å
¥å段并ç¹å»å建æé®æ¥æ·»å æ°çæ°æ®æº
-jmsmanager.connectionhelp.detailExp = 该é¾æ¥æä¾è¿æ¥å¨è¯¦ç»æ
åµ, ç¹å»è¯¥é¾æ¥å°ä»¥é®å¼å¯¹çå½¢å¼æ¾ç¤ºç¸å
³çä¿¡æ¯.ç¹å»'è¿å'æé®å¯è¿åJMSè¿æ¥å·¥å主页é¢
+jmsmanager.connectionhelp.detailExp = 该é¾æ¥æä¾è¿æ¥å¨è¯¦ç»æ
åµ, ç¹å»è¯¥é¾æ¥å°ä»¥é®å¼å¯¹çå½¢å¼æ¾ç¤ºç¸å
³çä¿¡æ¯.ç¹å»'è¿å'æé®å¯è¿å JMS è¿æ¥å·¥å主页é¢
jmsmanager.connectionhelp.nameExp = è¿æ¥å·¥åçå称
jmsmanager.connectionhelp.stateExp = è¿æ¥çç¶æ, å
æ¬'è¿è¡'å'åæ¢'
jmsmanager.connectionhelp.testConnExp = 该é¾æ¥ç¨äºæµè¯è¿æ¥å¨, å°è¿å"æåè¿æ¥"æè
ä¸ä¸ªé误信æ¯ã
-jmsmanager.connectionhelp.title = 该Portletæ¾ç¤ºå¨Geronimoæå¡å¨ä¸é
置并å
许添å æ°æ®æºçJMSè¿æ¥å¨
+jmsmanager.connectionhelp.title = 该 Portlet æ¾ç¤ºå¨ Geronimo æå¡å¨ä¸é
置并å
许添å æ°æ®æºçJMSè¿æ¥å¨
jmsmanager.help.addQueue_TopicExp = ç¹å»'æ·»å éåæ主é¢'é¾æ¥å¯ä»¥å建éåæè
主é¢.该é¾æ¥å°æå¼ç¨æ·å¯ç¨äºæ·»å éåæè
主é¢ç表å.å¡«å表åä¸çè¾å
¥æ¡å¹¶ç¹å»'æ交'æé®. 表åä¸çå段åæé®ä»¥å¦ä¸å½¢å¼å®ä¹"
-jmsmanager.help.applicationNameExp = 该项对åºäºgeronimo-web.xmlä¸ç'configID'.å¦æ该管ç对象é¨ç½²æ'stand-alone'å½¢å¼, å¯ä»¥è®¾ç½®æ'null'.
-jmsmanager.help.backBtnExp = è¿åæé®ç¨äºç´æ¥è¿åå°'JMSç®æ 管ç'页é¢, åæ¶æ·»å éåæ主é¢çæä½
+jmsmanager.help.applicationNameExp = 该项对åºäº geronimo-web.xml ä¸ç 'configID '.å¦æ该管ç对象é¨ç½²æ 'stand-alone' å½¢å¼, å¯ä»¥è®¾ç½®æ'null'.
+jmsmanager.help.backBtnExp = è¿åæé®ç¨äºç´æ¥è¿åå° 'JMS ç®æ 管ç'页é¢, åæ¶æ·»å éåæ主é¢çæä½
jmsmanager.help.clearBtnExp = æ¸
é¤æé®ç¨äºéç½®ææè¾å
¥æ¡å°é»è®¤å¼
-jmsmanager.help.destinationPhysicalNameExp = ActiveMQå¯è¯å«çè¿æ¥å·¥åçåå
+jmsmanager.help.destinationPhysicalNameExp = ActiveMQ å¯è¯å«çè¿æ¥å·¥åçåå
jmsmanager.help.messageDestinationNameExp = éåæ主é¢çå称, 该å称ç¨äºç®¡ç对象çgbeanå称,并ä¸geronimo-web.xmlé¨ç½²è®¡åä¸ç'message-destination-link'å段å
³è
-jmsmanager.help.moduleNameExp = å¦æ模å以'stand-alone'å½¢å¼é¨ç½², 该å段对åºäºgeronimo-web.xmlä¸ç'configID'. å¦æé¨ç½²äºä¸ä¸ªåºç¨ç¨åº(ear)ä¸, 该å段åºä¸ºå¨earä¸è¯¥æ¨¡åçè·¯å¾, ä¾å¦, myResourceAdapter.rar. é»è®¤æ
åµä¸è¯¥å段å
å«'defaultJMS'.
-jmsmanager.help.submitBtnExp = æ交åå°å建ä¸ä¸ªæ°çéåæè
主é¢, 并è¿åå°JMSç®æ 管ç页é¢
+jmsmanager.help.moduleNameExp = å¦æ模å以'stand-alone'å½¢å¼é¨ç½², 该å段对åºäº geronimo-web.xml ä¸ç'configID'. å¦æé¨ç½²äºä¸ä¸ªåºç¨ç¨åº(ear)ä¸, 该å段åºä¸ºå¨earä¸è¯¥æ¨¡åçè·¯å¾, ä¾å¦, myResourceAdapter.rar. é»è®¤æ
åµä¸è¯¥å段å
å«'defaultJMS'.
+jmsmanager.help.submitBtnExp = æ交åå°å建ä¸ä¸ªæ°çéåæè
主é¢, 并è¿åå° JMS ç®æ 管ç页é¢
jmsmanager.help.summary = <p>å¨JMSç®ç管ç页é¢ä¸, 'æä½'åæä¾ä¸ç±»é对éåæ主é¢çæä½. å é¤ä¸ä¸ªéåæ主é¢, ç¹å»å
¶å³ä¾§ç'å é¤'é¾æ¥;æ¥çä¸æ¡æ¶æ¯, ç¹å»å³ä¾§ç'æ¥çæ¶æ¯'é¾æ¥.æ¥çæ»ä¿¡éå, ç¹å»'æ¥ç DLG'é¾æ¥</p><p><strong>注æ:</strong>没ææ¶æ¯çéåæè
主é¢ä¼å¨æå¡å¨éå¯åå é¤</p>
jmsmanager.help.title = 该Portletç¨äºå建åå é¤éåæ主é¢.
jmsmanager.help.typeExp = æ¶æ¯çç±»å, å
æ¬éåæè
主é¢.
@@ -137,25 +137,25 @@
jmsmanager.sendmessage.type = ç±»å
jmsmanager.server.connector.editGeneric.addJMSConnector = Add new {0} connector for {1}
jmsmanager.server.connector.editGeneric.editJMSConnector = Edit {0} connector {1} for {2}.
-jmsmanager.server.connector.editGeneric.namingJMSConnectors = ä¸åäºå½åæå¡å¨ä¸åå¨çJMSè¿æ¥å¨çå称
+jmsmanager.server.connector.editGeneric.namingJMSConnectors = ä¸åäºå½åæå¡å¨ä¸åå¨ç JMS è¿æ¥å¨çå称
jmsmanager.server.connector.editGeneric.uniqueName = å¯ä¸çå称
jmsmanager.server.connector.editGeneric.uniqueNameExp = ç»è¿æ¥å¨åä¸ä¸ªä¸æå¡å¨ä¸ä»»ä½å
¶å®JMSè¿æ¥å¨ä¸åçå称
-jmsmanager.server.connector.help.title = æ¾ç¤ºä¸ºå½åå¯ç¨JMS brokersé
ç½®çææç½ç»è¿æ¥å¨ãä½ å¯ä»¥å¯å¨ï¼åæ¢ï¼æ·»å ï¼å é¤åç¼è¾JMSç½ç»è¿æ¥å¨ã
+jmsmanager.server.connector.help.title = æ¾ç¤ºä¸ºå½åå¯ç¨ JMS broker é
ç½®çææç½ç»è¿æ¥å¨ãä½ å¯ä»¥å¯å¨ï¼åæ¢ï¼æ·»å ï¼å é¤åç¼è¾JMSç½ç»è¿æ¥å¨ã
jmsmanager.server.connector.normal.addConnectorTo = æ·»å è¿æ¥å¨å°{0}
jmsmanager.server.connector.normal.addNewParaListener = æ·»å æ°ç<b>{0}</b>çå¬å¨
jmsmanager.server.connector.normal.confirmDelete = ä½ ç¡®ä¿¡è¦å é¤ {0} ?
-jmsmanager.server.connector.normal.noJMSNetworkConnectors = ä¸åå¨é¢å®ä¹çJMSç½ç»è¿æ¥å¨
-jmsmanager.server.connector.normal.title = å½åå¯ç¨çJMSç½ç»è¿æ¥å¨ï¼
-jmsmanager.server.help.title = æ¾ç¤ºå¯ç¨çJMS brokers
-jmsmanager.server.normal.addJMSBroker = æ·»å æ°çJMS Broker
-jmsmanager.server.normal.noJMSBrokers = ä¸åå¨é¢å®ä¹çJMS brokers
-jmsmanager.server.normal.title = å¨æå¡å¨ä¸å¯ç¨çJMS brokerså
æ¬
+jmsmanager.server.connector.normal.noJMSNetworkConnectors = ä¸åå¨é¢å®ä¹ç JMS ç½ç»è¿æ¥å¨
+jmsmanager.server.connector.normal.title = å½åå¯ç¨ç JMS ç½ç»è¿æ¥å¨ï¼
+jmsmanager.server.help.title = æ¾ç¤ºå¯ç¨ç JMS brokers
+jmsmanager.server.normal.addJMSBroker = æ·»å æ°ç JMS Broker
+jmsmanager.server.normal.noJMSBrokers = ä¸åå¨é¢å®ä¹ç JMS brokers
+jmsmanager.server.normal.title = å¨æå¡å¨ä¸å¯ç¨ç JMS brokers å
æ¬
jmsmanager.viewDLQ.deadLetterQueueName = Dead Letter Queue å称
-jmsmanager.viewDLQ.noMessages = å¨Dead Letter Queueä¸ç没ææ¶æ¯
+jmsmanager.viewDLQ.noMessages = å¨ Dead Letter Queue ä¸ç没ææ¶æ¯
jmsmanager.viewmessages.jsp.noMessagesInDest = ç®æ ä¸æ²¡ææ¶æ¯
jmswizard.common.Browse = æµè§
-jmswizard.common.JMSFactoryType = JMSå·¥åç±»å
+jmswizard.common.JMSFactoryType = JMS å·¥åç±»å
jmswizard.common.Purge = æ¸
é¤
jmswizard.common.Send = åé
jmswizard.common.actions = æä½
@@ -168,7 +168,7 @@
jmswizard.common.connectionFactoryName = è¿æ¥å·¥åå称
jmswizard.common.connectionPoolParameters = è¿æ¥æ± åæ°
jmswizard.common.consumerCount = æ¶è´¹è
æ»æ°
-jmswizard.common.currentStatusForJMSResourceGroup = JMSèµæºç»{0}çå½åç¶æ
+jmswizard.common.currentStatusForJMSResourceGroup = JMS èµæºç»{0}çå½åç¶æ
jmswizard.common.deployedAs = é¨ç½²ä¸º
jmswizard.common.destination = ç®æ
jmswizard.common.emptyText = ç¦ç¹æå¨å段ä¸è½ä¸ºç©ºã
@@ -193,47 +193,47 @@
jmswizard.destination.destinationConfSettings = ç®çå°é
ç½®
jmswizard.destination.messageDestinationName = æ¶æ¯ç®çå°å称
jmswizard.destination.title = <b>JMSèµæºç»</b> -- é
ç½®ç®çå°
-jmswizard.destinationType.JMSDestinationType = JMSç®çå°ç±»å
+jmswizard.destinationType.JMSDestinationType = JMS ç®çå°ç±»å
jmswizard.destinationType.selectDesiredInterfacetype = è¿ä¸ªèµæºéé
å¨å£°æäºå 个å¯è½ç®çå°æ¥å£ã为è¿ä¸ªç®çå°éæ©æ³è¦çæ¥å£ç±»åã
-jmswizard.destinationType.title = <b>JMSèµæºç»</b> -- éæ©ç®çå°ç±»å
-jmswizard.factory.title = <b>JMSèµæºç»</b> -- é
ç½®è¿æ¥å·¥å
-jmswizard.factoryType.title = <b>JMSèµæºç»</b> -- éæ©è¿æ¥å·¥åç±»å
+jmswizard.destinationType.title = <b>JMS èµæºç»</b> -- éæ©ç®çå°ç±»å
+jmswizard.factory.title = <b>JMS èµæºç»</b> -- é
ç½®è¿æ¥å·¥å
+jmswizard.factoryType.title = <b>JMS èµæºç»</b> -- éæ©è¿æ¥å·¥åç±»å
jmswizard.list.applicationScoped = åºç¨ç¨åºèå´
jmswizard.list.comfirmMsg01 = ç¡®å®æ¸
é¤æ¶æ¯ï¼
-jmswizard.list.createJMSResourceGroup = å建æ°çJMSèµæºç»:
-jmswizard.list.forAnotherJMSProvider = å
¶ä»JMSæä¾è
...
-jmswizard.list.noJMSResourceGroups = 没æé¢å®ä¹çJMSèµæºç»
+jmswizard.list.createJMSResourceGroup = å建æ°ç JMS èµæºç»:
+jmswizard.list.forAnotherJMSProvider = å
¶ä» JMS æä¾è
...
+jmswizard.list.noJMSResourceGroups = 没æé¢å®ä¹ç JMS èµæºç»
jmswizard.list.serverWide = æå¡ç«¯
-jmswizard.list.title = è¿ä¸ªé¡µé¢ååºäºææå¯ç¨çJMSèµæºç».
+jmswizard.list.title = è¿ä¸ªé¡µé¢ååºäºææå¯ç¨ç JMS èµæºç».
jmswizard.plan.JMSProviderRAR = JMS Provider RAR
-jmswizard.plan.JMSProviderRARExp = ç¨äºè¿æ¥å½åJMSæä¾è
çèµæºéé
RARå
. RARå
åºè¯¥å®è£
å¨GERONIMO/repository/ä¸ä»¥ä¾¿å¨å表ä¸æ¾ç¤º.
+jmswizard.plan.JMSProviderRARExp = ç¨äºè¿æ¥å½å JMS æä¾è
çèµæºéé
RAR å
. RAR å
åºè¯¥å®è£
å¨ GERONIMO/repository/ä¸ä»¥ä¾¿å¨å表ä¸æ¾ç¤º.
jmswizard.plan.addToEAR = æ·»å å°EAR
-jmswizard.plan.addToEARExp = ä½ å¯ä»¥æè¿ä¸ªJMSæ± é¨ç½²æEARä¸çä¸é¨åï¼èä¸æ¯æå®é¨ç½²æ顶å±çJMSèµæºãè¦å°JMSèµæºæ·»å å°EARä¸ï¼è¯·ä½¿ç¨ä¸é¢çæ¥éª¤ï¼<ol> <li>æ·è´å¹¶ç²å¸é¨ç½²è®¡åå°æ件ä¸</li> <li>ä¿åæ件å°ä½ çEARç顶å±ç®å½</li> <li>ä»<tt>{0}</tt>æ·è´RARæ件å°ä½ çEARç顶å±ç®å½</li> <li>å¨ä½ çEARä¸å建ä¸ä¸ª<tt>META-INF/geronimo-application.xml</tt>ï¼å
¶ä¸æä¸é¢è¿æ ·ç<tt>module</tt>æ¡ç®ï¼æ¿æ¢ææ£ç¡®çRARæ件ååé¨ç½²è®¡åæ件åï¼:</li></ol>
+jmswizard.plan.addToEARExp = ä½ å¯ä»¥æè¿ä¸ª JMS æ± é¨ç½²æ EAR ä¸çä¸é¨åï¼èä¸æ¯æå®é¨ç½²æ顶å±ç JMS èµæºãè¦å° JMS èµæºæ·»å å° EAR ä¸ï¼è¯·ä½¿ç¨ä¸é¢çæ¥éª¤ï¼<ol> <li>æ·è´å¹¶ç²å¸é¨ç½²è®¡åå°æ件ä¸</li> <li>ä¿åæ件å°ä½ ç EAR ç顶å±ç®å½</li> <li>ä»<tt>{0}</tt>æ·è´ RAR æ件å°ä½ ç EAR ç顶å±ç®å½</li> <li>å¨ä½ çEARä¸å建ä¸ä¸ª<tt>META-INF/geronimo-application.xml</tt>ï¼å
¶ä¸æä¸é¢è¿æ ·ç<tt>module</tt>æ¡ç®ï¼æ¿æ¢ææ£ç¡®çRARæ件ååé¨ç½²è®¡åæ件åï¼:</li></ol>
jmswizard.plan.deployCommand = é¨ç½²å½ä»¤
-jmswizard.plan.deployCommandExp = è¦å¨å½ä»¤è¡ä¸ä½¿ç¨è¿ä¸ªé¨ç½²è®¡åæ¥é¨ç½²JMSèµæºï¼è¯·æ·è´å¹¶ç²å¸ä¸é¢çXMLå°æ件ä¸ãï¼æ¯å¦ï¼<tt>plan-file.xml</tt>ï¼ï¼å¹¶ä¿åå®ãç¶åè¿è¡è±¡ä¸é¢çå½ï¼
+jmswizard.plan.deployCommandExp = è¦å¨å½ä»¤è¡ä¸ä½¿ç¨è¿ä¸ªé¨ç½²è®¡åæ¥é¨ç½² JMS èµæºï¼è¯·æ·è´å¹¶ç²å¸ä¸é¢ç XML å°æ件ä¸ãï¼æ¯å¦ï¼<tt>plan-file.xml</tt>ï¼ï¼å¹¶ä¿åå®ãç¶åè¿è¡è±¡ä¸é¢çå½ï¼
jmswizard.plan.deployJMSResource = é¨ç½²JMSèµæº
jmswizard.plan.deploymentPlan = é¨ç½²è®¡å
jmswizard.plan.edit = ç¼è¾è®¾ç½®
jmswizard.plan.title = <b>JMSèµæºç»</b> -- æ¾ç¤ºé¨ç½²è®¡å
jmswizard.provider.JMSProviderRAR = JMS Provider RAR
-jmswizard.provider.JMSProviderRARExp = ç¨äºè¿æ¥å½åJMSæä¾è
çèµæºéé
RARå
. RARå
åºè¯¥å®è£
å¨GERONIMO/repository/ä¸ä»¥ä¾¿å¨å表ä¸æ¾ç¤º.
+jmswizard.provider.JMSProviderRARExp = ç¨äºè¿æ¥å½å JMS æä¾è
çèµæºéé
RA Rå
. RAR å
åºè¯¥å®è£
å¨ GERONIMO/repository/ ä¸ä»¥ä¾¿å¨å表ä¸æ¾ç¤º.
jmswizard.provider.title = <b>JMS èµæºç»</b> -- éæ© JMS Provider RAR
-jmswizard.raInstance.BrokerXmlConfig = å¦æ使ç¨å
åµæ¨¡å¼ï¼è¯·è®¾å®ç¨äºè®¾ç½®å
åµçActiveMQ代ççXML设å®æ件(éè¿Spring)<br>BrokerXmlConfigæ¯è¯¥æ件åï¼å¦æ没ææå®URLçè¯ååå®å®å¨classpathä¸ãæ以å¼foo/bar.xmlå°åå®å¨classpathä¸ï¼èfile:dir/file.xmlå°ä½¿ç¨æ件系ç»ãæ¯æä»»ä½ææçURLå符串ã
-jmswizard.raInstance.Clientid = 建ç«å°ActiveMQæå¡å¨çè¿æ¥ä¸è®¾å®ç客æ·idã
-jmswizard.raInstance.Password = ç¨äºé»è®¤ç¨æ·ç»å½å°ActiveMQæå¡å¨çé»è®¤å¯ç ã
-jmswizard.raInstance.ServerUrl = ä½ æ³è¿æ¥å°çActiveMQæå¡å¨çURLãå¦æ使ç¨å
ç½®ç代çï¼è¿ä¸ªå¼åºè¯¥æ¯'vm://localhost'ã
+jmswizard.raInstance.BrokerXmlConfig = å¦æ使ç¨å
åµæ¨¡å¼ï¼è¯·è®¾å®ç¨äºè®¾ç½®å
åµç ActiveMQ 代çç XML 设å®æ件(éè¿ Spring)<br>BrokerXmlConfigæ¯è¯¥æ件åï¼å¦æ没ææå®URLçè¯ååå®å®å¨ classpath ä¸ãæä»¥å¼ foo/bar.xml å°åå®å¨ classpath ä¸ï¼è file:dir/file.xml å°ä½¿ç¨æ件系ç»ãæ¯æä»»ä½ææçURLå符串ã
+jmswizard.raInstance.Clientid = 建ç«å° ActiveMQ æå¡å¨çè¿æ¥ä¸è®¾å®ç客æ·idã
+jmswizard.raInstance.Password = ç¨äºé»è®¤ç¨æ·ç»å½å° ActiveMQ æå¡å¨çé»è®¤å¯ç ã
+jmswizard.raInstance.ServerUrl = ä½ æ³è¿æ¥å°ç ActiveMQ æå¡å¨ç URLãå¦æ使ç¨å
ç½®ç代çï¼è¿ä¸ªå¼åºè¯¥æ¯'vm://localhost'ã
jmswizard.raInstance.UseInboundSession = å¸å°å¼è®¾å®ä¼ åºçè¿æ¥æ¯å¦åºè¯¥å¤ç¨ä¼ å
¥çè¿æ¥çä¼è¯æ¥åéæ¶æ¯ã
-jmswizard.raInstance.UserName = ç¨äºå»ºç«å°ActiveMQæå¡å¨çè¿æ¥çé»è®¤ç¨æ·åã
+jmswizard.raInstance.UserName = ç¨äºå»ºç«å° ActiveMQ æå¡å¨çè¿æ¥çé»è®¤ç¨æ·åã
jmswizard.raInstance.basicConfigSettings = åºæ¬é
置设置.
jmswizard.raInstance.resourceGroupName = èµæºç»å称
-jmswizard.raInstance.resourceGroupNameExp = ä¸ä¸ªå¯ä¸çèµæºéé
å¨å称ã使ç¨è¿ä¸ªè®¾ç½®æ¥çæèµæºç»çé
ç½®å称ï¼å¹¶å°æ¶æ¯é©±å¨Beanè¿æ¥å°JMSæå¡å¨
+jmswizard.raInstance.resourceGroupNameExp = ä¸ä¸ªå¯ä¸çèµæºéé
å¨å称ã使ç¨è¿ä¸ªè®¾ç½®æ¥çæèµæºç»çé
ç½®å称ï¼å¹¶å°æ¶æ¯é©±å¨ Bean è¿æ¥å° JMS æå¡å¨
jmswizard.raInstance.title = <b>JMSèµæºç»</b> -- é
ç½®æå¡å¨è¿æ¥
-jmswizard.raInstance.titleExp = è¿ä¸ªé¡µé¢è¦è®¾ç½®çå±æ§å¯¹ä¸åçJMSæä¾è
æ¯ä¸ä¸æ ·çï¼ä½æ¯è¿äºé常æ¯é
ç½®å°JMSæå¡å¨çè¿æ¥å±æ§ãä½ å¨ä¸ä¸æ¥å建çè¿æ¥å·¥åï¼æè
ç®çå°é常è¦ä½¿ç¨è¿äºè®¾ç½®ä¸æå¡å¨éä¿¡ã
+jmswizard.raInstance.titleExp = è¿ä¸ªé¡µé¢è¦è®¾ç½®çå±æ§å¯¹ä¸åç JMS æä¾è
æ¯ä¸ä¸æ ·çï¼ä½æ¯è¿äºé常æ¯é
ç½®å°JMSæå¡å¨çè¿æ¥å±æ§ãä½ å¨ä¸ä¸æ¥å建çè¿æ¥å·¥åï¼æè
ç®çå°é常è¦ä½¿ç¨è¿äºè®¾ç½®ä¸æå¡å¨éä¿¡ã
jmswizard.status.addConnFactory = æ·»å è¿æ¥å·¥å
jmswizard.status.addDestination = æ·»å ç®çå°
jmswizard.status.deployNow = ç°å¨é¨ç½²
-jmswizard.status.factoriesDestinationsAdded = è¿æ¯å°ç®å为æ¢ä½ æ·»å çè¿æ¥å·¥ååç®çå°ãå½ä½ å®ææ·»å è¿æ¥å·¥ååç®çå°ä¹åï¼ä½ å¯ä»¥æ¥çè¿ä¸ªJMSèµæºç»çé¨ç½²è®¡åãæè
ç´æ¥é¨ç½²å®ã
-jmswizard.status.noFactoriesDestinations = å°ç®å为æ¢ï¼ä½ å·²ç»ä¸ºJMSèµæºç»çå¡«åäºå¿
é¡»çåºæ¬é
置信æ¯ãç°å¨ä½ å¯ä»¥å建è¿æ¥å·¥ååç®çå°ãå½ä½ å®ææ·»å è¿æ¥å·¥ååç®çå°ä¹åï¼ä½ å¯ä»¥æ¥çè¿ä¸ªJMSèµæºç»çé¨ç½²è®¡åãæè
ç´æ¥é¨ç½²å®ã
+jmswizard.status.factoriesDestinationsAdded = è¿æ¯å°ç®å为æ¢ä½ æ·»å çè¿æ¥å·¥ååç®çå°ãå½ä½ å®ææ·»å è¿æ¥å·¥ååç®çå°ä¹åï¼ä½ å¯ä»¥æ¥çè¿ä¸ª JMS èµæºç»çé¨ç½²è®¡åãæè
ç´æ¥é¨ç½²å®ã
+jmswizard.status.noFactoriesDestinations = å°ç®å为æ¢ï¼ä½ å·²ç»ä¸º JMS èµæºç»çå¡«åäºå¿
é¡»çåºæ¬é
置信æ¯ãç°å¨ä½ å¯ä»¥å建è¿æ¥å·¥ååç®çå°ãå½ä½ å®ææ·»å è¿æ¥å·¥ååç®çå°ä¹åï¼ä½ å¯ä»¥æ¥çè¿ä¸ª JMS èµæºç»çé¨ç½²è®¡åãæè
ç´æ¥é¨ç½²å®ã
jmswizard.status.resourceGroup = èµæºç»
jmswizard.status.showPlan = æ¾ç¤ºé¨ç½²è®¡å
-jmswizard.status.title = <b>JMSèµæºç»</b> -- å½åè¿å±
+jmswizard.status.title = <b>JMS èµæºç»</b> -- å½åè¿å±
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:23:55 2009
@@ -30,7 +30,7 @@
activemq.errorMsg04 = Error encountered while purging message destination {0}
activemq.infoMsg01 = Message sent successfully.
activemq.infoMsg02 = Deployment completed successfully!
-activemq.warnMsg01 = Can not count Consumer Count/Queue Size of {0} for the server url is not belong to an embedded broker
+activemq.warnMsg01 = Cannot count Consumer Count/Queue Size of {0} for the server url does not belong to an embedded broker
jmsmanager.broker.failAddBroker = Fail to add Broker {0} due to {1}
jmsmanager.broker.failDeleteBroker = Fail to delete the broker {0} due to {1}
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties Mon Dec 7 08:23:55 2009
@@ -16,13 +16,13 @@
# limitations under the License.
#=====================================================================
-JMS\ Network\ Listeners = JMSç½ç»çå¬å¨
+JMS\ Network\ Listeners = JMS ç½ç»çå¬å¨
-JMS\ Resources = JMSèµæº
+JMS\ Resources = JMS èµæº
-JMS\ Server = JMSæå¡å¨
+JMS\ Server = JMS æå¡å¨
-JMS\ Server\ Manager = JMSæå¡å¨ç®¡ç
+JMS\ Server\ Manager = JMS æå¡å¨ç®¡ç
activemq.errorMsg01 = åéæ¶æ¯æ¶éå°é误ã
activemq.errorMsg02 = é¨ç½²å¤±è´¥ï¼
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties Mon Dec 7 08:23:55 2009
@@ -20,18 +20,18 @@
dbwizard.basicParams.driverConnectionProperties = 驱å¨ç¨åºè¿æ¥å±æ§
dbwizard.basicParams.host = 主æº
dbwizard.basicParams.port = 端å£
-dbwizard.basicParams.propertyExp = ç¨æ¥è¿æ¥ {0} çå±æ§ãå¯è½æ¯å¯éçï¼è¯·åèJDBC 驱å¨çææ¡£ï¼
-dbwizard.basicParams.seeDocumentation = 请åèJDBC 驱å¨çææ¡£
+dbwizard.basicParams.propertyExp = ç¨æ¥è¿æ¥ {0} çå±æ§ã该å±æ§å¼å¯éï¼è¯·åè JDBC 驱å¨çææ¡£ï¼
+dbwizard.basicParams.seeDocumentation = 请åè JDBC 驱å¨çææ¡£
dbwizard.basicParams.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤2: éæ©é©±å¨ç¨åºï¼JARï¼åæ°
-dbwizard.basicParams.typicalJDBCURL = å
¸åçJDBC URL
+dbwizard.basicParams.typicalJDBCURL = å
¸åç JDBC URL
dbwizard.basicParams.unableToLoadDriver = ä¸è½ä»éä¸ç JAR å
ä¸å 载驱å¨!
dbwizard.common.DBPassword = æ°æ®åºå¯ç
dbwizard.common.DBPasswordExp = ç¨äºè¿æ¥æ°æ®åºçå¯ç
dbwizard.common.DBUserName = æ°æ®åºç¨æ·å
dbwizard.common.DBUserNameExp = ç¨äºè¿æ¥æ°æ®åºçç¨æ·å
-dbwizard.common.JDBCConnectURL = JDBCè¿æ¥URL
-dbwizard.common.JDBCDriverClass = JDBC驱å¨ç±»
-dbwizard.common.URLFits = ç¡®ä¿çæçURL符åä½ çJDBC驱å¨çè¯æ³ã
+dbwizard.common.JDBCConnectURL = JDBC è¿æ¥ URL
+dbwizard.common.JDBCDriverClass = JDBC 驱å¨ç±»
+dbwizard.common.URLFits = ç¡®ä¿çæç URL 符åä½ ç JDBC 驱å¨çè¯æ³ã
dbwizard.common.actions = æä½
dbwizard.common.blockingTimeout = é»å¡è¶
æ¶
dbwizard.common.cancel = åæ¶
@@ -43,7 +43,7 @@
dbwizard.common.deploy = é¨ç½²
dbwizard.common.downloadDriver = ä¸è½½é©±å¨
dbwizard.common.driverJAR = é©±å¨ JAR
-dbwizard.common.driverJARExplanation = è¿æ¥å°æ°æ®åºæ¶æéè¦ç JAR å
ãä½¿ç¨ CTRL æè
SHIFT é®éæ©å¤ä¸ª JAR å
ã<br>è¿äº JAR å
åºè¯¥å·²è¢«å®è£
å¨GERONIMO/repository/ç®å½ä¸ï¼ï¼æè
+dbwizard.common.driverJARExplanation = è¿æ¥å°æ°æ®åºæ¶æéè¦ç JAR å
ãä½¿ç¨ CTRL æè
SHIFT é®éæ©å¤ä¸ª JAR å
ã<br>è¿äº JAR å
åºè¯¥å·²è¢«å®è£
å¨ GERONIMO/repository/ ç®å½ä¸ï¼ï¼æè
dbwizard.common.driverTransactionTypes = 该è¿æ¥æ± æ¯æçäºå¡ç±»å
dbwizard.common.edit = ç¼è¾
dbwizard.common.editSettings = ç¼è¾è®¾ç½®
@@ -51,11 +51,11 @@
dbwizard.common.finish = å®æ
dbwizard.common.idleTimeout = 空é²æ¶é´
dbwizard.common.import = ä»{0}导å
¥
-dbwizard.common.importFromJBoss = ä»JBoss 4导å
¥
-dbwizard.common.importFromWebLogic = ä»WebLogic 8.1导å
¥
+dbwizard.common.importFromJBoss = ä» JBoss 4导å
¥
+dbwizard.common.importFromWebLogic = ä» WebLogic 8.1导å
¥
dbwizard.common.inMilliseconds = 毫ç§
dbwizard.common.inMinutes = åé
-dbwizard.common.maxNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ç®ãé»è®¤å¼æ¯10ã
+dbwizard.common.maxNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ç®ãé»è®¤å¼æ¯ 10ã
dbwizard.common.name = åå
dbwizard.common.next = ä¸ä¸æ¥
dbwizard.common.passwordMismatch = å¯ç ä¸å¹é
ã
@@ -70,30 +70,30 @@
dbwizard.common.state = ç¶æ
dbwizard.common.testConnection = æµè¯è¿æ¥
dbwizard.common.transactionType = äºå¡ç±»å
-dbwizard.common.usingPoolWizard = 使ç¨Geronimoæ°æ®åºè¿æ¥æ± å导
+dbwizard.common.usingPoolWizard = ä½¿ç¨ Geronimo æ°æ®åºè¿æ¥æ± å导
dbwizard.confirmURL.blockingTimeoutExp = æ¯æ¬¡è°ç¨æéçå¾
çæé¿æ¶é´ãç空表示使ç¨é»è®¤å¼ã
dbwizard.confirmURL.driverStatus = 驱å¨ç¶æ
dbwizard.confirmURL.idleTimeoutExp = è¿æ¥å¨å
³éä¹åè½æå¤é¿ç©ºé²æ¶é´ãç空表示使ç¨é»è®¤å¼ã
dbwizard.confirmURL.loadedSuccessfully = æåå 载驱å¨
dbwizard.confirmURL.maxNoOfCon = è¿æ¥æ± ä¸æ大è¿æ¥æ°ãç空表示使ç¨é»è®¤å¼ã
dbwizard.confirmURL.minimumNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ãç空表示使ç¨é»è®¤å¼ã
-dbwizard.confirmURL.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤3: è¿æ¥æ± æåé
ç½®
+dbwizard.confirmURL.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤ 3: è¿æ¥æ± æåé
ç½®
dbwizard.downloadStatus.summary = è¿ä¸ªé¡µé¢ç¨äºçæµé©±å¨ç¨åºä¸è½½è¿ç¨ã
dbwizard.downloadStatus.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- ä¸è½½é©±å¨
dbwizard.edit.basicConProperties = è¿æ¥åºæ¬å±æ§
-dbwizard.edit.blockingTimeoutExp = æ¯æ¬¡è°ç¨æéçå¾
çæé¿æ¶é´ãé»è®¤ä¸º5000ã
-dbwizard.edit.errorMsg01 = æ± çæå°å¼å¿
é¡»æ¯ä¸ä¸ªæ°åï¼é»è®¤å¼æ¯0.
-dbwizard.edit.errorMsg02 = æ± çæå°å¼ä¸è½æ¯è´æ°ï¼é»è®¤å¼æ¯0.
-dbwizard.edit.errorMsg03 = æ± çæ大å¼å¿
é¡»æ¯ä¸ä¸ªæ°åï¼é»è®¤å¼æ¯10.
-dbwizard.edit.errorMsg04 = æ± çæ大å¼å¿
须大äº0ï¼é»è®¤å¼æ¯10ã
+dbwizard.edit.blockingTimeoutExp = æ¯æ¬¡è°ç¨æéçå¾
çæé¿æ¶é´ãé»è®¤ä¸º 5000ã
+dbwizard.edit.errorMsg01 = æ± çæå°å¼å¿
é¡»æ¯ä¸ä¸ªæ°åï¼é»è®¤å¼æ¯ 0.
+dbwizard.edit.errorMsg02 = æ± çæå°å¼ä¸è½æ¯è´æ°ï¼é»è®¤å¼æ¯ 0.
+dbwizard.edit.errorMsg03 = æ± çæ大å¼å¿
é¡»æ¯ä¸ä¸ªæ°åï¼é»è®¤å¼æ¯ 10.
+dbwizard.edit.errorMsg04 = æ± çæ大å¼å¿
é¡»å¤§äº 0ï¼é»è®¤å¼æ¯ 10ã
dbwizard.edit.errorMsg05 = æ± çæ大å¼å¿
须大äºæå°å¼ã
-dbwizard.edit.idleTimeoutExp = è¿æ¥å¨å
³éä¹åè½æå¤é¿ç©ºé²æ¶é´ãé»è®¤ä¸º15ã
-dbwizard.edit.maxNoOfCon = è¿æ¥æ± ä¸æ大è¿æ¥æ°ç®ãé»è®¤ä¸º10.
-dbwizard.edit.minimumNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ç®ãé»è®¤ä¸º0ã
+dbwizard.edit.idleTimeoutExp = è¿æ¥å¨å
³éä¹åè½æå¤é¿ç©ºé²æ¶é´ãé»è®¤ä¸º 15ã
+dbwizard.edit.maxNoOfCon = è¿æ¥æ± ä¸æ大è¿æ¥æ°ç®ãé»è®¤ä¸º 10.
+dbwizard.edit.minimumNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ç®ãé»è®¤ä¸º 0ã
dbwizard.edit.poolName = è¿æ¥æ± å称
dbwizard.edit.poolNameExp = ä¸ä¸ªä¸åäºæå¡å¨ä¸å
¶å®æ°æ®åºè¿æ¥æ± çå称ï¼å称ä¸è¯·ä¸è¦æç©ºæ ¼ï¼ã
dbwizard.edit.poolType = è¿æ¥æ± ç±»å
-dbwizard.edit.seeDocumentation = 请åèJDBC驱å¨çææ¡£
+dbwizard.edit.seeDocumentation = 请åè JDBC 驱å¨çææ¡£
dbwizard.edit.seeLog = æ¥çæ¥å¿æ件äºè§£è¯¦æ
dbwizard.edit.summary = è¿ä¸ªé¡µé¢ç¨äºç¼è¾å·²åå¨çæ°æ®åºè¿æ¥æ± ã
dbwizard.edit.unableToLoadDriver = ä¸è½ä»éä¸ç JAR å
ä¸å 载驱å¨!
@@ -101,15 +101,15 @@
dbwizard.importStatus.importFailed = 导å
¥è¿æ¥æ± 失败ï¼æè
没æåç°ä»»ä½å¯ç¨çæ°æ®åºè¿æ¥æ± ï¼
dbwizard.importStatus.importMessages = 导å
¥è¿ç¨ä¸çæ¶æ¯
dbwizard.importStatus.importStatus = 导å
¥ç¶æ
-dbwizard.importStatus.originalJNDI = åå§JNDI
+dbwizard.importStatus.originalJNDI = åå§ JNDI
dbwizard.importStatus.originalName = åå§è¿æ¥æ± å称
-dbwizard.importStatus.summary = ä¸è¡¨ååºäºå¯è¯å«åºçæ°æ®åºè¿æ¥æ± ãä½ å¯ä»¥æä»»ä½æ®é JDBC è¿æ¥æ± æè
XA è¿æ¥æ± é¨ç½²å°Geronimoï¼å 为 Geronimo å
å«æ¯æ XA çéé
å¨ãä¸é¢çè¿æ¥æ± å表æ¯ä¸ä¸ªå¯¼å
¥è¿ç¨ä¸çç¶æä¿¡æ¯å表ã
+dbwizard.importStatus.summary = ä¸è¡¨ååºäºå¯è¯å«åºçæ°æ®åºè¿æ¥æ± ãä½ å¯ä»¥æä»»ä½æ®é JDBC è¿æ¥æ± æè
XA è¿æ¥æ± é¨ç½²å° Geronimoï¼å 为 Geronimo å
å«æ¯æ XA çéé
å¨ãä¸é¢çè¿æ¥æ± å表æ¯ä¸ä¸ªå¯¼å
¥è¿ç¨ä¸çç¶æä¿¡æ¯å表ã
dbwizard.importStatus.title = <b>导å
¥æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤2: æ£æ¥å·²å¯¼å
¥æ°æ®
-dbwizard.importUpload.aboutWebLogic = å¦æWebLogic 8.1åGeronimoå®è£
å¨åä¸å°æºå¨ï¼å¹¶ä¸è¿è¡Geronimoçç¨æ·æWebLogicåç®å½ç读åæéçè¯ï¼ä½ ä¹å¯ä»¥ç´æ¥æåWebLogicçå®è£
ååç®å½ãè¿æ ·ç好å¤å¨äºå¯¼å
¥è¿ç¨è½å¤è¯»åæ°æ®åºçå¯ç ï¼èå¦æä½ ä»
ä»
导å
¥ä¸é¢ç<tt>config.xml</tt>ï¼ä½ å°±å¿
é¡»éæ°è¾å
¥ææçå¯ç ã
+dbwizard.importUpload.aboutWebLogic = å¦æ WebLogic 8.1 å Geronimo å®è£
å¨åä¸å°æºå¨ï¼å¹¶ä¸è¿è¡ Geronimo çç¨æ·æ WebLogic åç®å½ç读åæéçè¯ï¼ä½ ä¹å¯ä»¥ç´æ¥æå WebLogic çå®è£
ååç®å½ãè¿æ ·ç好å¤å¨äºå¯¼å
¥è¿ç¨è½å¤è¯»åæ°æ®åºçå¯ç ï¼èå¦æä½ ä»
ä»
导å
¥ä¸é¢ç<tt>config.xml</tt>ï¼ä½ å°±å¿
é¡»éæ°è¾å
¥ææçå¯ç ã
dbwizard.importUpload.alternateImport = {0}å¯é导å
¥é¡¹
dbwizard.importUpload.domainDirectoryPath = åç®å½è·¯å¾
-dbwizard.importUpload.domainDirectoryPathExp = 请è¾å
¥WebLogicåç®å½çå®å
¨è·¯å¾ï¼å
å«<tt>config.xml</tt>æ件ï¼ã
-dbwizard.importUpload.enterFullPath = 请è¾å
¥å°<tt>weblogic81/server/lib</tt>ç®å½çå®å
¨è·¯å¾ã
+dbwizard.importUpload.domainDirectoryPathExp = 请è¾å
¥ WebLogic åç®å½çå®å
¨è·¯å¾ï¼å
å«<tt>config.xml</tt>æ件ï¼ã
+dbwizard.importUpload.enterFullPath = 请è¾å
¥å° <tt>weblogic81/server/lib</tt> ç®å½çå®å
¨è·¯å¾ã
dbwizard.importUpload.path = è·¯å¾
dbwizard.importUpload.pleaseSelect = 请éæ©
dbwizard.importUpload.summary = è¿ä¸ªé¡µé¢å¼å§ä»å
¶å®åºç¨æå¡å¨å¯¼å
¥æ°æ®åºè¿æ¥æ± çè¿ç¨ã为äºå¯¼å
¥è¿æ¥æ± ï¼ä½ éè¦ä½¿ç¨ä¸é¢çå段æ¥ä¸ä¼ å
¶å®æå¡å¨çé
ç½®æ件ãèæ们ä¼å°½é转æ¢è¿äºå¼ãå¹¶è®©ä½ ç¡®è®¤å¨é
ç½®æ件ä¸æ¾å°çæ¯ä¸ªè¿æ¥æ± çé
ç½®ã
@@ -126,18 +126,18 @@
dbwizard.selectDatabase.nameOfPool = æ°æ®åºè¿æ¥æ± å称
dbwizard.selectDatabase.nameOfPoolExplanation = åä¸ä¸ªä¸æå¡å¨ä¸å
¶å®æ°æ®åºè¿æ¥æ± ä¸åçå称ï¼å称ä¸è¯·ä¸è¦æç©ºæ ¼ï¼ã
dbwizard.selectDatabase.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤1: éæ©å称åæ°æ®åº
-dbwizard.selectDownload.otherJDBCDrivers = è¿éæ¯ä½ å¯è½æ³èªå·±ä¸è½½çå
¶å®ä¸äºJDBC驱å¨ï¼åªéè¦ä¿åå®ä»¬å°geronimo/repository/ä¸çæ个å°æ¹å³å¯ï¼
+dbwizard.selectDownload.otherJDBCDrivers = è¿éæ¯ä½ å¯è½æ³èªå·±ä¸è½½çå
¶å®ä¸äº JDBC 驱å¨ï¼åªéè¦ä¿åå®ä»¬å° Geronimo/repository/ ä¸çæ个å°æ¹å³å¯ï¼
dbwizard.selectDownload.selectDriver = éæ©é©±å¨
-dbwizard.selectDownload.selectDriverExp = Geronimoå¯ä»¥èªå¨ä¸ºä½ ä¸è½½ç驱å¨ã
+dbwizard.selectDownload.selectDriverExp = Geronimo å¯ä»¥èªå¨ä¸ºä½ ä¸è½½ç驱å¨ã
dbwizard.selectDownload.selectOtherDatabase = éæ©å
¶å®æ°æ®åº
dbwizard.selectDownload.selectPredefinedDatabase = éæ©"é¢å®ä¹"çæ°æ®åº
-dbwizard.selectDownload.summary = <p>è¿ä¸ªé¡µé¢è®©ä½ èªå¨å°ä¸è½½æ°æ®åºç驱å¨å¨ï¼è¿äºé©±å¨çJARå
ä¸éè¦ç»å½æ注åå³å¨çº¿å¯ç¨ã</p><p><i>å¦æè¿ä¸ªé¡µé¢è±è´¹äºå¾é¿æ¶é´ä¸è½½é©±å¨ï¼æè
å¨ä¸é¢çä¸ææ¡ä¸æ²¡æä»»ä½é©±å¨ï¼é£ä¹è¿å¯è½æå³çä½ å®è£
çGeronimoä¸è½è¿æ¥å°apache.orgæ¥è·å¾æå
³é©±å¨ä¸è½½çé
ç½®æ件ãæ们对è¿å¼èµ·çä¸ä¾¿é常æ±æï¼ä½ å¯ä»¥ç¨åå次å°è¯ï¼æè
æå¨å°å®è£
驱å¨ï¼æ·è´é©±å¨å°geronimo/reposit
ory/ä¸çç®å½ï¼ã</i></p>
+dbwizard.selectDownload.summary = <p>è¿ä¸ªé¡µé¢è®©ä½ èªå¨å°ä¸è½½æ°æ®åºç驱å¨å¨ï¼è¿äºé©±å¨ç JAR å
ä¸éè¦ç»å½æ注åå³å¨çº¿å¯ç¨ã</p><p><i>å¦æè¿ä¸ªé¡µé¢è±è´¹äºå¾é¿æ¶é´ä¸è½½é©±å¨ï¼æè
å¨ä¸é¢çä¸ææ¡ä¸æ²¡æä»»ä½é©±å¨ï¼é£ä¹è¿å¯è½æå³çä½ å®è£
çGeronimoä¸è½è¿æ¥å°apache.orgæ¥è·å¾æå
³é©±å¨ä¸è½½çé
ç½®æ件ãæ们对è¿å¼èµ·çä¸ä¾¿é常æ±æï¼ä½ å¯ä»¥ç¨åå次å°è¯ï¼æè
æå¨å°å®è£
驱å¨ï¼å°é©±å¨å¤å¶å° Geronim
o/repository/ä¸çç®å½ï¼ã</i></p>
dbwizard.selectDownload.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤2: éæ©é©±å¨ï¼JARï¼åæ°
dbwizard.showPlan.addToEAR = æ·»å å°EAR
-dbwizard.showPlan.deployAsPartEAR = ä½ å¯ä»¥é¨ç½²è¿æ¥æ± 为EARçä¸é¨åï¼èä¸æ¯é¨ç½²ä¸ºtop-levelçæ°æ®åºè¿æ¥æ± ãæç
§ä¸é¢çæ¥éª¤å¯ä»¥é¨ç½²è¿æ¥æ± 为EARçä¸é¨åï¼<ol> <li>æ·è´å¹¶ç²å¸é¨ç½²è®¡åå°æ件ä¸</li> <li>ä¿åè¿ä»½é¨ç½²è®¡åæ件å°ä½ çEARç顶å±ç®å½ä¸</li> <li>ä»<tt>GERONIMO_HOME/{0}</tt>ä¸æ·è´RARæ件å°ä½ çEARç顶å±ç®å½ä¸</li> <li>å¨ä½ çEARä¸å建<tt>META-INF/geronimo-application.xml</tt>æ件ï¼å
¶ä¸å
å«ç±»ä¼¼ä¸é¢ç<tt>module</tt>çæ¡ç®ï¼ ï¼æ¿æ¢ææ£ç¡®çRARæ件å
称åé¨ç½²è®¡åæ件çå称ï¼ï¼</li></ol>
+dbwizard.showPlan.deployAsPartEAR = ä½ å¯ä»¥é¨ç½²è¿æ¥æ± 为 EAR çä¸é¨åï¼èä¸æ¯é¨ç½²ä¸º top-level çæ°æ®åºè¿æ¥æ± ãæç
§ä¸é¢çæ¥éª¤å¯ä»¥é¨ç½²è¿æ¥æ± 为EARçä¸é¨åï¼<ol> <li>æ·è´å¹¶ç²å¸é¨ç½²è®¡åå°æ件ä¸</li> <li>ä¿åè¿ä»½é¨ç½²è®¡åæ件å°ä½ çEARç顶å±ç®å½ä¸</li> <li>ä»<tt>GERONIMO_HOME/{0}</tt>ä¸æ·è´RARæ件å°ä½ çEARç顶å±ç®å½ä¸</li> <li>å¨ä½ çEARä¸å建<tt>META-INF/geronimo-application.xml</tt>æ件ï¼å
¶ä¸å
å«ç±»ä¼¼ä¸é¢ç<tt>module</tt>çæ¡ç®ï¼ ï¼æ¿æ¢ææ£ç¡®çRARæ件å
称åé¨ç½²è®¡åæ件çå称ï¼ï¼</li></ol>
dbwizard.showPlan.deployCommand = é¨ç½²å½ä»¤
dbwizard.showPlan.deployPool = é¨ç½²è¿æ¥æ±
-dbwizard.showPlan.deployPoolFromCommandLine = 为äºå¨å½ä»¤è¡ä¸ä½¿ç¨é¨ç½²è®¡åæ¥é¨ç½²è¿æ¥æ± ï¼æ·è´å¹¶ç²å¸ä¸é¢çXMLå°æ件ä¸ï¼å¦ï¼<tt>plan-file.xml</tt>ï¼ä¿åå®ãç¶åæ§è¡ç±»ä¼¼ä¸é¢çå½ä»¤ï¼
+dbwizard.showPlan.deployPoolFromCommandLine = 为äºå¨å½ä»¤è¡ä¸ä½¿ç¨é¨ç½²è®¡åæ¥é¨ç½²è¿æ¥æ± ï¼æ·è´å¹¶ç²å¸ä¸é¢ç XML å°æ件ä¸ï¼å¦ï¼<tt>plan-file.xml</tt>ï¼ä¿åå®ãç¶åæ§è¡ç±»ä¼¼ä¸é¢çå½ä»¤ï¼
dbwizard.showPlan.deploymentPlan = é¨ç½²è®¡å
dbwizard.showPlan.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¾ç¤ºé¨ç½²è®¡å
dbwizard.testConnection.connectedTo = è¿æ¥å°
@@ -146,29 +146,29 @@
dbwizard.testConnection.testAgain = å次æµè¯
dbwizard.testConnection.testError = æµè¯é误
dbwizard.testConnection.testResult = æµè¯ç»æ
-dbwizard.testConnection.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤4: æµè¯è¿æ¥
+dbwizard.testConnection.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤ 4ï¼æµè¯è¿æ¥
dbwizard.tranql-connector-db2-xa.DatabaseName = æ°æ®åºå称
-dbwizard.tranql-connector-db2-xa.DatabaseNameExp = æå®æ°æ®åºæå¡å¨çå称ã该å称ä½ä¸ºè¿æ¥URLçæ°æ®åºé¨åã
+dbwizard.tranql-connector-db2-xa.DatabaseNameExp = æå®æ°æ®åºæå¡å¨çå称ã该å称ä½ä¸ºè¿æ¥ URL çæ°æ®åºé¨åã
dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXa = Downgrade Hold Cursors
dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXaExp = æå®ä¸æææéå
³èçéæ¯å¦ä¼é级
dbwizard.tranql-connector-db2-xa.DriverType = 驱å¨ç±»å
-dbwizard.tranql-connector-db2-xa.DriverTypeExp = ç¨äºå»ºç«å°è¯¥æ°æ®æºçè¿æ¥ç驱å¨ç±»åãå¯è½çå¼æ2å4.é»è®¤å¼æ¯ç±»å4.
+dbwizard.tranql-connector-db2-xa.DriverTypeExp = ç¨äºå»ºç«å°è¯¥æ°æ®æºçè¿æ¥ç驱å¨ç±»åãå¯éç±»åå¼ä¸º 2 æ 4ãé»è®¤å¼æ¯ç±»å4.
dbwizard.tranql-connector-db2-xa.Password = å¯ç
dbwizard.tranql-connector-db2-xa.PasswordExp = \
dbwizard.tranql-connector-db2-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-db2-xa.PortNumberExp = æå®è¿ç«¯æ°æ®åºä¾¦å¬å°æ¥è¿æ¥ç端å£å·ãDB2æå¡å¨é»è®¤ä¸º50000.
+dbwizard.tranql-connector-db2-xa.PortNumberExp = æå®è¿ç«¯æ°æ®åºä¾¦å¬å°æ¥è¿æ¥ç端å£å·ãDB2 æå¡å¨é»è®¤ä¸º50000.
dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSize = PreparedStatementç¼å大å°
dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = åè¯é©±å¨æ¯ä¸ªè¿æ¥åºè¯¥å
³èå¤å°ä¸ªPreparedStatementãé»è®¤å¼æ¯ä¸ä½¿ç¨PreparedStatementç¼åã
dbwizard.tranql-connector-db2-xa.ResultSetHoldability = ResultSetHoldability
dbwizard.tranql-connector-db2-xa.ResultSetHoldabilityExp = ç»æéçå¯ä¿åæ§æ两个å¯éå¼ : HOLD_CURSORS_OVER_COMMIT å CLOSE_CURSORS_AT_COMMIT. ä»»ä½ä¸ä¸ªå¼å¯ä»¥éè¿ resultSetConcurrency å resultSetHoldability çææç»åè¿è¡è®¾ç½®. æ¨æ设置çå¼è®²è¦ç Connection çé»è®¤å¼. <br/><br/>HOLD_CURSORS_OVER_COMMIT = 1<br/>CLOSE_CURSORS_AT_COMMIT = 2
dbwizard.tranql-connector-db2-xa.ServerName = æå¡å¨å称
-dbwizard.tranql-connector-db2-xa.ServerNameExp = DB2驱å¨éè¦è¿æ¥å°ç主æºçå称æè
IPå°åã该项没æé»è®¤å¼ã
-dbwizard.tranql-connector-db2-xa.TraceFile = Traceæ件
+dbwizard.tranql-connector-db2-xa.ServerNameExp = DB2 驱å¨éè¦è¿æ¥å°ç主æºçå称æè
IP å°åã该项没æé»è®¤å¼ã
+dbwizard.tranql-connector-db2-xa.TraceFile = Trace æ件
dbwizard.tranql-connector-db2-xa.TraceFileAppend = TraceFileAppend
-dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = æå®æ¯ç´¯å è¿æ¯è¦çTraceæ件ã该å±æ§çç±»å为å¸å°å¼ãé»è®¤å¼æ¯false,æ为è¦çTraceæ件ã
+dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = æå®æ¯ç´¯å è¿æ¯è¦ç Trace æ件ã该å±æ§çç±»å为å¸å°å¼ãé»è®¤å¼æ¯ false ,æ为è¦ç Trace æ件ã
dbwizard.tranql-connector-db2-xa.TraceFileExp = æ¾ç½®è·è¸ªè®°å½çæ件å称ã
dbwizard.tranql-connector-db2-xa.UserName = ç¨æ·å称
-dbwizard.tranql-connector-db2-xa.UserNameExp = ç¨äºè¿æ¥å°è¿ç«¯æ°æ®åºæå¡å¨çç¨æ·IDçå称ã
+dbwizard.tranql-connector-db2-xa.UserNameExp = ç¨äºè¿æ¥å°è¿ç«¯æ°æ®åºæå¡å¨çç¨æ· ID çå称ã
dbwizard.tranql-connector-derby-client-local.CreateDatabase = å建æ°æ®åº
dbwizard.tranql-connector-derby-client-local.CreateDatabaseExp = æ å¿ä½æ示æ°æ®åºä¸åå¨æ¶æ¯å¦è¦å建ã
dbwizard.tranql-connector-derby-client-local.DatabaseName = æ°æ®åºå称
@@ -178,11 +178,11 @@
dbwizard.tranql-connector-derby-client-local.Password = å¯ç
dbwizard.tranql-connector-derby-client-local.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-derby-client-local.PortNumber = 端å£å·
-dbwizard.tranql-connector-derby-client-local.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
+dbwizard.tranql-connector-derby-client-local.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
dbwizard.tranql-connector-derby-client-local.ServerName = æå¡å¨å称
dbwizard.tranql-connector-derby-client-local.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-derby-client-local.UserName = ç¨æ·å
-dbwizard.tranql-connector-derby-client-local.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤çschema,å¦æçç¥å®å¼æé»è®¤è®¾ä¸º'APP'ã
+dbwizard.tranql-connector-derby-client-local.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤ç schema ,å¦æçç¥ï¼å¼æé»è®¤è®¾ä¸º'APP'ã
dbwizard.tranql-connector-derby-client-xa.CreateDatabase = å建æ°æ®åº
dbwizard.tranql-connector-derby-client-xa.CreateDatabaseExp = æ å¿ä½æ示æ°æ®åºä¸åå¨æ¶æ¯å¦è¦å建ã
dbwizard.tranql-connector-derby-client-xa.DatabaseName = æ°æ®åºå称
@@ -192,51 +192,51 @@
dbwizard.tranql-connector-derby-client-xa.Password = å¯ç
dbwizard.tranql-connector-derby-client-xa.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-derby-client-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-derby-client-xa.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
+dbwizard.tranql-connector-derby-client-xa.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
dbwizard.tranql-connector-derby-client-xa.ServerName = æå¡å¨å称
dbwizard.tranql-connector-derby-client-xa.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-derby-client-xa.UserName = ç¨æ·å
-dbwizard.tranql-connector-derby-client-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤çschema,å¦æçç¥å®å¼æé»è®¤è®¾ä¸º'APP'ã
+dbwizard.tranql-connector-derby-client-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤ç schema ,å¦æçç¥ï¼å¼æé»è®¤è®¾ä¸º'APP'ã
dbwizard.tranql-connector-derby-embed-local.CreateDatabase = å建æ°æ®åº
dbwizard.tranql-connector-derby-embed-local.CreateDatabaseExp = æ å¿ä½æ示æ°æ®åºä¸åå¨æ¶æ¯å¦è¦å建ã
dbwizard.tranql-connector-derby-embed-local.DatabaseName = æ°æ®åºå称
dbwizard.tranql-connector-derby-embed-local.DatabaseNameExp = è¦è¿æ¥çæ°æ®åºå称ã
dbwizard.tranql-connector-derby-embed-local.LoginTimeout = ç»å½è¶
æ¶
-dbwizard.tranql-connector-derby-embed-local.LoginTimeoutExp = 该é
ç½®å±æ§å½å被Derby忽ç¥ã
+dbwizard.tranql-connector-derby-embed-local.LoginTimeoutExp = 该é
ç½®å±æ§å½å被 Derby 忽ç¥ã
dbwizard.tranql-connector-derby-embed-local.Password = å¯ç
dbwizard.tranql-connector-derby-embed-local.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-derby-embed-local.ShutdownDatabase = å
³éæ°æ®åº
-dbwizard.tranql-connector-derby-embed-local.ShutdownDatabaseExp = å¦æ设为å符串"shutdown"ï¼åä»æ°æ®æºè·å¾ä¸ä¸ªjava.sql.Connection对象åå
³éæ°æ®åºã
+dbwizard.tranql-connector-derby-embed-local.ShutdownDatabaseExp = å¦æ设为å符串 "shutdown"ï¼åä»æ°æ®æºè·å¾ä¸ä¸ª java.sql.Connection 对象åå
³éæ°æ®åºã
dbwizard.tranql-connector-derby-embed-local.UserName = ç¨æ·å
-dbwizard.tranql-connector-derby-embed-local.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤çschema,å¦æçç¥å®å¼æé»è®¤è®¾ä¸º'APP'ã
+dbwizard.tranql-connector-derby-embed-local.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤ç schema ,å¦æçç¥ï¼å¼æé»è®¤è®¾ä¸º'APP'ã
dbwizard.tranql-connector-derby-embed-xa.CreateDatabase = å建æ°æ®åº
dbwizard.tranql-connector-derby-embed-xa.CreateDatabaseExp = æ å¿ä½æ示æ°æ®åºä¸åå¨æ¶æ¯å¦è¦å建ãè¿æ¯ä¸ä¸ªå¸å°å¼ã
dbwizard.tranql-connector-derby-embed-xa.DatabaseName = æ°æ®åºå称
dbwizard.tranql-connector-derby-embed-xa.DatabaseNameExp = è¦è¿æ¥çæ°æ®åºå称ã
dbwizard.tranql-connector-derby-embed-xa.LoginTimeout = ç»å½è¶
æ¶
-dbwizard.tranql-connector-derby-embed-xa.LoginTimeoutExp = 该é
ç½®å±æ§å½å被Derby忽ç¥ã
+dbwizard.tranql-connector-derby-embed-xa.LoginTimeoutExp = 该é
ç½®å±æ§å½å被 Derby 忽ç¥ã
dbwizard.tranql-connector-derby-embed-xa.Password = å¯ç
dbwizard.tranql-connector-derby-embed-xa.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-derby-embed-xa.UserName = ç¨æ·å
-dbwizard.tranql-connector-derby-embed-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤çschema,å¦æçç¥å®å¼æé»è®¤è®¾ä¸º'APP'ã
+dbwizard.tranql-connector-derby-embed-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤ç schema,å¦æçç¥ï¼å¼æé»è®¤è®¾ä¸º'APP'ã
dbwizard.tranql-connector-informix-xa.DatabaseName = æ°æ®åºå称
dbwizard.tranql-connector-informix-xa.DatabaseNameExp = æ°æ®åºå称ã
dbwizard.tranql-connector-informix-xa.IfxHost = IfxHost
-dbwizard.tranql-connector-informix-xa.IfxHostExp = Informixæ°æ®åºæå¡å¨çIPå°åæè
主æºåã
+dbwizard.tranql-connector-informix-xa.IfxHostExp = Informix æ°æ®åºæå¡å¨ç IP å°åæè
主æºåã
dbwizard.tranql-connector-informix-xa.IfxProtocolTrace = IfxProtocolTrace
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceExp = IfxPROTOCOLTRACEçå¼ã
+dbwizard.tranql-connector-informix-xa.IfxProtocolTraceExp = IfxPROTOCOLTRACE çå¼ã
dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFile = IfxProtocolTraceFile
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFileExp = IfxPROTOCOLTRACEFILEçå¼ã
+dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFileExp = IfxPROTOCOLTRACEFILE çå¼ã
dbwizard.tranql-connector-informix-xa.IfxSQLHostFile = IfxSQLHostFile
-dbwizard.tranql-connector-informix-xa.IfxSQLHostFileExp = IfxSQLH_FILEçå¼ã
+dbwizard.tranql-connector-informix-xa.IfxSQLHostFileExp = IfxSQLH_FILE çå¼ã
dbwizard.tranql-connector-informix-xa.IfxSQLHostType = IfxSQLHostType
-dbwizard.tranql-connector-informix-xa.IfxSQLHostTypeExp = IfxSQLH_TYPEçå¼ã
+dbwizard.tranql-connector-informix-xa.IfxSQLHostTypeExp = IfxSQLH_TYPE çå¼ã
dbwizard.tranql-connector-informix-xa.Password = å¯ç
dbwizard.tranql-connector-informix-xa.PasswordExp = å¯ç ï¼åºå大å°åï¼ã
dbwizard.tranql-connector-informix-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-informix-xa.PortNumberExp = Informixæ°æ®åºæå¡å¨ç端å£å·ã
+dbwizard.tranql-connector-informix-xa.PortNumberExp = Informix æ°æ®åºæå¡å¨ç端å£å·ã
dbwizard.tranql-connector-informix-xa.ServerName = æå¡å¨å称
-dbwizard.tranql-connector-informix-xa.ServerNameExp = Informixæ°æ®åºæå¡å¨çå®ä¾å称ã
+dbwizard.tranql-connector-informix-xa.ServerNameExp = Informix æ°æ®åºæå¡å¨çå®ä¾å称ã
dbwizard.tranql-connector-informix-xa.UserName = ç¨æ·å
dbwizard.tranql-connector-informix-xa.UserNameExp = ç¨æ·åï¼åºå大å°åï¼ã
dbwizard.tranql-connector-mysql-local.DatabaseName = æ°æ®åºå称
@@ -244,7 +244,7 @@
dbwizard.tranql-connector-mysql-local.Password = å¯ç
dbwizard.tranql-connector-mysql-local.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-mysql-local.PortNumber = 端å£å·
-dbwizard.tranql-connector-mysql-local.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
+dbwizard.tranql-connector-mysql-local.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
dbwizard.tranql-connector-mysql-local.ServerName = æå¡å¨å称
dbwizard.tranql-connector-mysql-local.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-mysql-local.UserName = ç¨æ·å
@@ -254,7 +254,7 @@
dbwizard.tranql-connector-mysql-xa.Password = å¯ç
dbwizard.tranql-connector-mysql-xa.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-mysql-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-mysql-xa.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
+dbwizard.tranql-connector-mysql-xa.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
dbwizard.tranql-connector-mysql-xa.ServerName = æå¡å¨å称
dbwizard.tranql-connector-mysql-xa.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-mysql-xa.UserName = ç¨æ·å
@@ -269,7 +269,7 @@
dbwizard.tranql-connector-oracle-local.DriverTypeExp = \
dbwizard.tranql-connector-oracle-local.LoginTimeout = ç»å½è¶
æ¶
dbwizard.tranql-connector-oracle-local.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-local.MaxStatements = Statementæ大å¼
+dbwizard.tranql-connector-oracle-local.MaxStatements = Statement æ大å¼
dbwizard.tranql-connector-oracle-local.MaxStatementsExp = \
dbwizard.tranql-connector-oracle-local.NetworkProtocol = ç½ç»åè®®
dbwizard.tranql-connector-oracle-local.NetworkProtocolExp = \
@@ -281,7 +281,7 @@
dbwizard.tranql-connector-oracle-local.ServerNameExp = \
dbwizard.tranql-connector-oracle-local.ServiceName = æå¡å称
dbwizard.tranql-connector-oracle-local.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-local.TNSEntryName = TNSæ¡ç®å称
+dbwizard.tranql-connector-oracle-local.TNSEntryName = TNS æ¡ç®å称
dbwizard.tranql-connector-oracle-local.TNSEntryNameExp = \
dbwizard.tranql-connector-oracle-local.UserName = ç¨æ·å
dbwizard.tranql-connector-oracle-local.UserNameExp = \
@@ -295,7 +295,7 @@
dbwizard.tranql-connector-oracle-xa.DriverTypeExp = \
dbwizard.tranql-connector-oracle-xa.LoginTimeout = ç»å½è¶
æ¶
dbwizard.tranql-connector-oracle-xa.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-xa.MaxStatements = Statementæ大å¼
+dbwizard.tranql-connector-oracle-xa.MaxStatements = Statement æ大å¼
dbwizard.tranql-connector-oracle-xa.MaxStatementsExp = \
dbwizard.tranql-connector-oracle-xa.NetworkProtocol = ç½ç»åè®®
dbwizard.tranql-connector-oracle-xa.NetworkProtocolExp = \
@@ -307,7 +307,7 @@
dbwizard.tranql-connector-oracle-xa.ServerNameExp = \
dbwizard.tranql-connector-oracle-xa.ServiceName = æå¡å称
dbwizard.tranql-connector-oracle-xa.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-xa.TNSEntryName = TNSæ¡ç®å称
+dbwizard.tranql-connector-oracle-xa.TNSEntryName = TNS æ¡ç®å称
dbwizard.tranql-connector-oracle-xa.TNSEntryNameExp = \
dbwizard.tranql-connector-oracle-xa.UserName = ç¨æ·å
dbwizard.tranql-connector-oracle-xa.UserNameExp = \
@@ -316,8 +316,8 @@
dbwizard.tranql-connector-postgresql-local.Password = å¯ç
dbwizard.tranql-connector-postgresql-local.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-postgresql-local.PortNumber = 端å£å·
-dbwizard.tranql-connector-postgresql-local.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
-dbwizard.tranql-connector-postgresql-local.PrepareThreshold = Prepareéå¼
+dbwizard.tranql-connector-postgresql-local.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
+dbwizard.tranql-connector-postgresql-local.PrepareThreshold = Prepare éå¼
dbwizard.tranql-connector-postgresql-local.PrepareThresholdExp = \
dbwizard.tranql-connector-postgresql-local.ServerName = æå¡å¨å称
dbwizard.tranql-connector-postgresql-local.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
@@ -328,56 +328,56 @@
dbwizard.tranql-connector-postgresql-xa.Password = å¯ç
dbwizard.tranql-connector-postgresql-xa.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-postgresql-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-postgresql-xa.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
-dbwizard.tranql-connector-postgresql-xa.PrepareThreshold = Prepareéå¼
+dbwizard.tranql-connector-postgresql-xa.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
+dbwizard.tranql-connector-postgresql-xa.PrepareThreshold = Prepare éå¼
dbwizard.tranql-connector-postgresql-xa.PrepareThresholdExp = \
dbwizard.tranql-connector-postgresql-xa.ServerName = æå¡å¨å称
dbwizard.tranql-connector-postgresql-xa.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-postgresql-xa.UserName = ç¨æ·å
dbwizard.tranql-connector-postgresql-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åã
dbwizard.tranql-connector-sqlserver2000-xa.DatabaseName = æ°æ®åºå称
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = è¦è¿æ¥çSQL Serveræ°æ®åºå称ã
+dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = è¦è¿æ¥ç SQL Server æ°æ®åºå称ã
dbwizard.tranql-connector-sqlserver2000-xa.Password = å¯ç
-dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = ç¨äºè¿æ¥SQL Serveræ°æ®åºçåºå大å°åçå¯ç ã
+dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = ç¨äºè¿æ¥ SQL Server æ°æ®åºçåºå大å°åçå¯ç ã
dbwizard.tranql-connector-sqlserver2000-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = SQL ServerçTCP端å£ï¼é»è®¤ä¸º1433.
+dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = SQL Server ç TCP 端å£ï¼é»è®¤ä¸º 1433ã
dbwizard.tranql-connector-sqlserver2000-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}.æ¥é
微软æ档以è·å¾æ´å¤ä¿¡æ¯ï¼Directä¸è½ç¨äºå管ç¯å¢ä¸ã
+dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}.æ¥é
微软æ档以è·å¾æ´å¤ä¿¡æ¯ï¼Direct ä¸è½ç¨äºå管ç¯å¢ä¸ã
dbwizard.tranql-connector-sqlserver2000-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}ãæ¥é
微软æ档以è·å¾ç»èãé»è®¤æ¯true,è¿ä¸å¤§ä¼å¯¼è´ç¼ç å²çªä½å¨ä¸äºç¯å¢ä¸å¯è½ä¼ç¥å¾®æ
¢ä¸äºã
+dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}ãæ¥é
微软æ档以è·å¾ç»èãé»è®¤æ¯trueï¼è¿ä¸å¤§ä¼å¯¼è´ç¼ç å²çªä½å¨ä¸äºç¯å¢ä¸å¯è½ä¼ç¥å¾®æ
¢ä¸äºã
dbwizard.tranql-connector-sqlserver2000-xa.ServerName = æå¡å¨å称
-dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = SQL ServerçIPå°åã
+dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = SQL Server ç IP å°åã
dbwizard.tranql-connector-sqlserver2000-xa.UserName = ç¨æ·å
-dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = ç¨äºè¿æ¥SQL Serveræ°æ®åºçåºå大å°åçç¨æ·åã
+dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = ç¨äºè¿æ¥ SQL Server æ°æ®åºçåºå大å°åçç¨æ·åã
dbwizard.tranql-connector-sqlserver2005-xa.DatabaseName = æ°æ®åºå称
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = è¦è¿æ¥çSQL Serveræ°æ®åºå称ã
+dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = è¦è¿æ¥ç SQL Server æ°æ®åºå称ã
dbwizard.tranql-connector-sqlserver2005-xa.Password = å¯ç
-dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = ç¨äºè¿æ¥SQL Serveræ°æ®åºçåºå大å°åçå¯ç ã
+dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = ç¨äºè¿æ¥ SQL Server æ°æ®åºçåºå大å°åçå¯ç ã
dbwizard.tranql-connector-sqlserver2005-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = SQL ServerçTCP端å£ï¼é»è®¤ä¸º1433.
+dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = SQL Server ç TCP 端å£ï¼é»è®¤ä¸º 1433ã
dbwizard.tranql-connector-sqlserver2005-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}.æ¥é
微软æ档以è·å¾æ´å¤ä¿¡æ¯ï¼Directä¸è½ç¨äºå管ç¯å¢ä¸ã
+dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}.æ¥é
微软æ档以è·å¾æ´å¤ä¿¡æ¯ï¼Direct ä¸è½ç¨äºå管ç¯å¢ä¸ã
dbwizard.tranql-connector-sqlserver2005-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}ãæ¥é
微软æ档以è·å¾ç»èãé»è®¤æ¯true,è¿ä¸å¤§ä¼å¯¼è´ç¼ç å²çªä½å¨ä¸äºç¯å¢ä¸å¯è½ä¼ç¥å¾®æ
¢ä¸äºã
+dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}ãæ¥é
微软æ档以è·å¾ç»èãé»è®¤æ¯trueï¼è¿ä¸å¤§ä¼å¯¼è´ç¼ç å²çªä½å¨ä¸äºç¯å¢ä¸å¯è½ä¼ç¥å¾®æ
¢ä¸äºã
dbwizard.tranql-connector-sqlserver2005-xa.ServerName = æå¡å¨å称
-dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = SQL ServerçIPå°åã
+dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = SQL Server ç IP å°åã
dbwizard.tranql-connector-sqlserver2005-xa.UserName = ç¨æ·å
-dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = ç¨äºè¿æ¥SQL Serveræ°æ®åºçåºå大å°åçç¨æ·åã
+dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = ç¨äºè¿æ¥ SQL Server æ°æ®åºçåºå大å°åçç¨æ·åã
dbwizard.usage.applicationCode = åºç¨ä»£ç
-dbwizard.usage.geronimo_webExp = <p>è¦æèµæºå¼ç¨æåGernimoä¸ç¹å®çæ°æ®åºè¿æ¥æ± ï¼Webåºç¨ä¸éè¦æ<tt>geronimo-web.xml</tt>é¨ç½²è®¡åãå®å¯ä»¥æå
å¨WARå
ä¸ç<tt>WEB-INF</tt>ç®å½ï¼ä¹å¯ä»¥å¨å½ä»¤è¡ä¸å°å®åç¬æä¾ç»é¨ç½²å·¥å
·ã<tt>geronimo-web.xml</tt>é¨ç½²è®¡åä¸æ<tt>dependency</tt>å
ç´ å¯ä»¥ç¨æ¥æåæ°æ®åºè¿æ¥æ± 模åï¼å对åºäºäºä¸é¢<tt>web.xml</tt>ç <tt>resource-ref</tt>ç<tt>resource-ref</tt>åï¼å®ç¨æ¥æèµæºå¼ç¨æåç¹å®çæ°æ®åºè¿æ¥æ± ãå¨è¿ä¸ªåä¸<tt>ref-name</tt>å¿
é¡»ä¸
<tt>web.xml</tt> ä¸ç<tt>resource-link</tt>ç¸ä¸è´ã<tt>resource-link</tt>å¨å称ä¸å¿
é¡»ä¸æå¡å¨ä¸å®ä¹çæ°æ®åºè¿æ¥æ± å称ç¸ä¸è´ã</p><p><i>å¦æä½ å¨Geronimoä¸åªé¨ç½²äºä¸ä¸ªåå«{0}çæ°æ®åºè¿æ¥æ± ï¼ä½ å¯ä»¥åä¸é¢ä¸æ ·æåè¿æ¥æ± ã</i></p>
+dbwizard.usage.geronimo_webExp = <p>è¦æèµæºå¼ç¨æå Gernimo ä¸ç¹å®çæ°æ®åºè¿æ¥æ± ï¼Webåºç¨ä¸éè¦æ<tt>geronimo-web.xml</tt>é¨ç½²è®¡åãå®å¯ä»¥æå
å¨ WAR å
ä¸ç<tt>WEB-INF</tt>ç®å½ï¼ä¹å¯ä»¥å¨å½ä»¤è¡ä¸å°å®åç¬æä¾ç»é¨ç½²å·¥å
·ã<tt>geronimo-web.xml</tt>é¨ç½²è®¡åä¸æ<tt>dependency</tt>å
ç´ å¯ä»¥ç¨æ¥æåæ°æ®åºè¿æ¥æ± 模åï¼å对åºäºäºä¸é¢<tt>web.xml</tt>ç <tt>resource-ref</tt>ç<tt>resource-ref</tt>åï¼å®ç¨æ¥æèµæºå¼ç¨æåç¹å®çæ°æ®åºè¿æ¥æ± ãå¨è¿ä¸ªåä¸<tt>ref-name</tt>å¿
é¡»
¸<tt>web.xml</tt> ä¸ç<tt>resource-link</tt>ç¸ä¸è´ã<tt>resource-link</tt>å¨å称ä¸å¿
é¡»ä¸æå¡å¨ä¸å®ä¹çæ°æ®åºè¿æ¥æ± å称ç¸ä¸è´ã</p><p><i>å¦æä½ å¨Geronimoä¸åªé¨ç½²äºä¸ä¸ªåå«{0}çæ°æ®åºè¿æ¥æ± ï¼ä½ å¯ä»¥åä¸é¢ä¸æ ·æåè¿æ¥æ± ã</i></p>
dbwizard.usage.moreThanOnePool = å¦æä½ æå¤äºä¸ä¸ªçè¿æ¥æ± å«åï¼{0}(举ä¾æ¥è¯´,æ两个ä¾èµé¡¹ï¼<b>æ¯ä¸ª</b>é½å
å«ä¸ä¸ªå«{0}çç»ä»¶),é£ä¹ä½ å¯ä»¥åä¸é¢ä¸æ ·æ´ç²¾ç¡®å°å®ä¹è¦ä½¿ç¨çè¿æ¥æ± ï¼
dbwizard.usage.resource_refSection = <tt>web.xml</tt>ä¸æä¸ä¸ª<tt>resource-ref</tt>段å¯ä»¥ç¨æ¥è±¡ä¸é¢ä¸æ ·å£°ææ°æ®åºè¿æ¥æ± ã注æï¼æ们使ç¨<tt>res-ref-name</tt>æ å°å°æå¡å¨ä¸å®ä¹çè¿æ¥æ± çå¼ç¨ãå¨åºç¨ä¸ä½¿ç¨<tt>res-ref-name</tt>çå¼æ¥è®¿é®è¿æ¥æ± ã
dbwizard.usage.searchOnlyOne = è¿ä¼å¨å½ååºç¨ä¸æ¥æ¾ä¸ä¸ªå为{0} çæ°æ®åºè¿æ¥æ± åä»»ä½å为ä¾èµé¡¹ç模åï¼ä»¥åè¿äºä¾èµé¡¹çä¾èµé¡¹ççï¼ã
-dbwizard.usage.title = è¿ä¸ªé¡µé¢ä»ç»äºææ ·å¨J2EEåºç¨ä¸ä½¿ç¨æ°æ®åºè¿æ¥æ± {0}ãè¿é以Webåºç¨ä¸ºä¾ï¼å
¶å®åºç¨æ¨¡åä¹åºè¯¥å¯ä»¥ç¨åæ ·çæ¹å¼å¤çã
+dbwizard.usage.title = è¿ä¸ªé¡µé¢ä»ç»äºææ ·å¨ Java EE åºç¨ä¸ä½¿ç¨æ°æ®åºè¿æ¥æ± {0}ãè¿é以 Web åºç¨ä¸ºä¾ï¼å
¶å®åºç¨æ¨¡åä¹åºè¯¥å¯ä»¥ç¨åæ ·çæ¹å¼å¤çã
dbwizard.usage.usingInCode = è¦è·å¾æåæ°æ®åºè¿æ¥æ± çå¼ç¨ï¼å¨ä½ çåºç¨ä¸åºè¯¥ä½¿ç¨ç±»ä¼¼ä¸é¢ç代ç ã注æï¼ä½ ç JNDI å符串åºè¯¥æ¯<tt>java:comp/env/</tt>åå <tt>web.xml</tt>ä¸ç<tt>res-ref-name</tt>ã
-derbylogmanager.help.title = è¿ä¸ªportletæ¾ç¤ºäºGeronimoå
é¨æ°æ®åºDerbyçæ¥å¿ä¿¡æ¯ã
+derbylogmanager.help.title = è¿ä¸ª portle tæ¾ç¤ºäº Geronimo å
åµæ°æ®åº Derby çæ¥å¿ä¿¡æ¯ã
derbylogmanager.view.Lines = è¡
derbylogmanager.view.containingText = å
å«æå
derbylogmanager.view.filterLog = è¿æ»¤æ¥å¿
derbylogmanager.view.filterResults = è¿æ»¤ç»æ
derbylogmanager.view.integer = ç¦ç¹æå¨å段å¿
须为æ´æ°ã
-derbylogmanager.view.matchCriterial = å¨æ¥å¿æ件ä¸æ»å
±æ {0} æ¡ä¿¡æ¯ï¼ä¸ æ¡ä»¶å¹é
çæ {1} æ¡ã
+derbylogmanager.view.matchCriterial = å¨æ¥å¿æ件ä¸æ»å
±æ {0} æ¡ä¿¡æ¯ï¼ä¸æ¡ä»¶å¹é
çæ {1} æ¡ã
derbylogmanager.view.maxResults = æå¤æ¾ç¤º
derbylogmanager.view.noEntries = 没ææ¾å°ç¬¦åæ¡ä»¶çä¿¡æ¯ã
derbylogmanager.view.numberOfResultsCapped = è¦ççç»ææ°
@@ -390,10 +390,10 @@
internaldb.common.DBProductName = æ°æ®åºäº§åå
internaldb.common.DBProductVersion = æ°æ®åºäº§åçæ¬
internaldb.common.Item = 项
-internaldb.common.JDBCMajorVersion = JDBCé«çæ¬å·
-internaldb.common.JDBCMinorVersion = JDBCä½çæ¬å·
-internaldb.common.SQLCommands = SQLå½ä»¤
-internaldb.common.SQLStateType = SQLè¯å¥ç±»å
+internaldb.common.JDBCMajorVersion = JDBC é«çæ¬å·
+internaldb.common.JDBCMinorVersion = JDBC ä½çæ¬å·
+internaldb.common.SQLCommands = SQL å½ä»¤
+internaldb.common.SQLStateType = SQL è¯å¥ç±»å
internaldb.common.Value = å¼
internaldb.common.application = åºç¨
internaldb.common.create = å建
@@ -419,7 +419,7 @@
internaldb.common.resultSetHoldability = ç»æéçä¿æå
internaldb.common.schemas = 模å¼
internaldb.common.stringFunctions = å符串å½æ°
-internaldb.common.supportedSQLKeywords = æ¯æçSQLå
³é®å
+internaldb.common.supportedSQLKeywords = æ¯æç SQL å
³é®å
internaldb.common.supportedTypes = æ¯æçç±»å
internaldb.common.system = ç³»ç»
internaldb.common.systemFunctions = ç³»ç»å½æ°
@@ -440,12 +440,12 @@
internaldb.listTables.noTables = 没æ表
internaldb.runSQLHelp.createDBExp = è¾å
¥è¦æ°å建çæ°æ®åºçå称ï¼ç¶åç¹å»"å建"æé®ã
internaldb.runSQLHelp.deleteDBExp = è¦å é¤ä¸ä¸ªå·²ç»åå¨çæ°æ®åºï¼è¯·ä»ä¸ææ¡ä¸éæ©å®ï¼å¹¶ç¹å»"å é¤."ã
-internaldb.runSQLHelp.runSQLExp = å¨"SQLå½ä»¤"ææ¬æ¡ä¸ï¼è¾å
¥ç¨åå·åå²çSQLå½ä»¤ï¼ç¹å»"è¿è¡ SQL"æé®æ¥è¿è¡SQLå½ä»¤ã
-internaldb.runSQLHelp.summary = å
许ç¨æ·ä½¿ç¨SQLå½ä»¤ç´æ¥æä½è¡¨ä¸çæ°æ®ï¼å¹¶ä¸å建æå é¤æ°æ®åºãå¨"SQLå½ä»¤"ææ¬æ¡ä¸ï¼ç¨æ·å¯ä»¥è¾å
¥ SQL å½ä»¤,并ç¹å»"è¿è¡SQL."
+internaldb.runSQLHelp.runSQLExp = å¨" SQL å½ä»¤"ææ¬æ¡ä¸ï¼è¾å
¥ç¨åå·åå²ç SQL å½ä»¤ï¼ç¹å»"è¿è¡ SQL"æé®æ¥è¿è¡ SQL å½ä»¤ã
+internaldb.runSQLHelp.summary = å
许ç¨æ·ä½¿ç¨SQLå½ä»¤ç´æ¥æä½è¡¨ä¸çæ°æ®ï¼å¹¶ä¸å建æå é¤æ°æ®åºãå¨"SQL å½ä»¤"ææ¬æ¡ä¸ï¼ç¨æ·å¯ä»¥è¾å
¥ SQL å½ä»¤,并ç¹å»"è¿è¡ SQL."
internaldb.runSQLHelp.useDBExp = ä»ä¸ææ¡ä¸éæ©è¦æä½çæ°æ®åº
internaldb.runSQLHelp.useDSExp = ä»ä¸ææ¡ä¸éæ©è¦æä½çæ°æ®æº
internaldb.runSQLNormal.note1 = 1) 使ç¨;åå¼å¤ä¸ªè¯å¥
-internaldb.runSQLNormal.note2 = 2) å个Selectè¯å¥çæ¥è¯¢ç»æä¼è¢«æ¾ç¤º
+internaldb.runSQLNormal.note2 = 2) å个 Select è¯å¥çæ¥è¯¢ç»æä¼è¢«æ¾ç¤º
internaldb.runSQLNormal.note3 = 3) 使ç¨åå¼å·æ¬ä½ææ¬å符串
internaldb.runSQLNormal.reallyDeleteDatabase = ç¡®å®è¦å é¤è¿ä¸ªæ°æ®åºä¹ï¼
internaldb.runSQLNormal.runSQL = è¿è¡SQL
Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp Mon Dec 7 08:23:55 2009
@@ -124,7 +124,7 @@
<!-- Body -->
<td align="left" valign="top">
- <p><center><b>If you're seeing this page via a web browser, it means you've setup<br />
+ <p><center><b>If you're seeing this page via a Web browser, it means you've setup<br />
Apache Geronimo™ successfully. Congratulations!</b></center></p>
<p>As you may have guessed by now, this is the default home page for Geronimo. If you're seeing this page,
@@ -140,12 +140,12 @@
<div style="margin-left: 50px; margin-right: 50px; padding: 10px; background-color:#eee">
<p><b>Would you like your application to appear at this URL?</b><br />
- To set the context root for a web application, you can write a Geronimo deployment
+ To set the context root for a Web application, you can write a Geronimo deployment
plan that uses the <tt>context-root</tt> element to specify the URL prefix used to
reach that application. If you specify a context root of <tt>"/"</tt> then the
application will appear at this URL. However, you'll need to stop this small
Welcome application first!</p>
- <p>Your web deployment plan should look like this, and you can either pack it into
+ <p>Your Web deployment plan should look like this, and you can either pack it into
the WAR at <tt>WEB-INF/geronimo-web.xml</tt> or provide it as a separate argument
to the deploy tool.</p>
<pre><web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
@@ -166,7 +166,7 @@
deploy.[bat|sh] deploy MyWebApp-1.0.war</pre>
</div>
- <p>Geronimo mailing lists are available at the Geronimo project web site:</p>
+ <p>Geronimo mailing lists are available at the Geronimo project Web site:</p>
<ul>
<li><b><a href="mailto:user-subscribe@geronimo.apache.org">user@geronimo.apache.org</a></b> for general questions related to configuring and using Geronimo</li>
@@ -200,7 +200,7 @@
<tr><th colspan="2">Web Application WARs (<a href="/console/portal/apps/apps_war">list</a>)</th></tr>
<tr>
<td>geronimo/jmxdebug-<% if(jetty) {%>jetty<%} else {%>tomcat<%}%>/1.0/car</td>
- <td><i>Optional</i>; JMX debugging web application</td>
+ <td><i>Optional</i>; JMX debugging Web application</td>
</tr>
<tr>
<td>geronimo/jsp-examples-<% if(jetty) {%>jetty<%} else {%>tomcat<%}%>/1.0/car</td>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties Mon Dec 7 08:23:55 2009
@@ -19,8 +19,8 @@
ajax.progressbar.processing = å¤çä¸...
car.addRepository.currentlyPluginRepositories = å½åå¯ç¨çæ件ä»åºæ
-car.addRepository.downloadRunningCongfig = ä½ ä¹å¯ä»¥å°±åæµè§å¹¶å®è£
第ä¸æ¹æ件ä¸æ ·ä»å¦ä¸ä¸ªGeronimoæå¡å¨ä¸ä¸è½½è¿è¡æ¶çé
ç½®ï¼å¦æä½ è¦æåè¿ç¨Geronimoæå¡å¨ï¼å¨ä¸é¢è¾å
¥ç±»ä¼¼<tt>http://geronimo-server:8080/plugin/maven-repo/</tt>çURL
-car.addRepository.howToAddPluginRepositories = è¦æ·»å ä¸ä¸ªæ°çæ件ä»åºå°å表ä¸ï¼å¨ä¸é¢çææ¬æ¡ä¸è¾å
¥ä»åºçURLãä»åºç顶å±ç®å½ä¸å¿
é¡»æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件ï¼æ件ä¸ååºäºè¯¥åä»ä¸å¯ç¨çæ件ã
+car.addRepository.downloadRunningCongfig = ä½ ä¹å¯ä»¥å°å¦ä¸ä¸ª Geronimo æå¡å¨ä¸çæ件ä»åºæ·»å å°å½åæå¡å¨ä¸ãå¦æä½ è¦æ·»å ä¸ä¸ªè¿ç¨ Geronimo æå¡å¨ä¸çæ件ä»åºï¼å¨ä¸é¢ææ¬æ¡ä¸è¾å
¥è¦æ·»å çæ件ä»åºçé¾æ¥å°åï¼å¦ <tt>http://geronimo-server:8080/plugin/maven-repo/</tt>
+car.addRepository.howToAddPluginRepositories = è¦æ·»å ä¸ä¸ªæ°çæ件ä»åºå°å表ä¸ï¼å¨ä¸é¢çææ¬æ¡ä¸è¾å
¥è¯¥ä»åºçé¾æ¥å°åãä»åºçæ ¹ç®å½ä¸å¿
é¡»å
å«ä¸ä¸ª<tt>geronimo-plugins.xml</tt> æ件以ååºè¯¥åä»ä¸å¯ç¨çæ件ã
car.addRepository.title = æ·»å æ件ä»åº
car.assemblyConfirm.description = æè¿°
car.assemblyConfirm.moduleId = 模åID
@@ -30,68 +30,68 @@
car.common.assemble = ç»è£
car.common.author = ä½è
car.common.category = ç§ç±»
-car.common.createGeronimoPlugin = å建Geronimoæ件
+car.common.createGeronimoPlugin = å建 Geronimo æ件
car.common.dependencies = ä¾èµé¡¹
car.common.downloadRepositories = å·²ä¸è½½çåå¨åº
car.common.exportPlugin = 导åºæ件
-car.common.geronimoVersions = Geronimoçæ¬
+car.common.geronimoVersions = Geronimo çæ¬
car.common.group = ç»
car.common.license = 许å¯è¯
car.common.moduleID = 模åID
car.common.newRepository = æ°çåå¨åº
car.common.obsoletes = åºå¼
car.common.openSource = å¼æ¾æºç
-car.common.pluginURL = æ件çURL
-car.common.prereq1Description = å
å³æ¡ä»¶1æè¿°
-car.common.prereq2Description = å
å³æ¡ä»¶2æè¿°
-car.common.prereq3Description = å
å³æ¡ä»¶3æè¿°
-car.common.prerequisite1ID = å
å³æ¡ä»¶1ID
-car.common.prerequisite1Type = å
å³æ¡ä»¶1ç±»å
-car.common.prerequisite2ID = å
å³æ¡ä»¶2ID
-car.common.prerequisite2Type = å
å³æ¡ä»¶2ç±»å
-car.common.prerequisite3ID = å
å³æ¡ä»¶3ID
-car.common.prerequisite3Type = å
å³æ¡ä»¶3ç±»å
+car.common.pluginURL = æ件ç URL
+car.common.prereq1Description = å
å³æ¡ä»¶ 1 æè¿°
+car.common.prereq2Description = å
å³æ¡ä»¶ 2 æè¿°
+car.common.prereq3Description = å
å³æ¡ä»¶ 3 æè¿°
+car.common.prerequisite1ID = å
å³æ¡ä»¶ 1 ID
+car.common.prerequisite1Type = å
å³æ¡ä»¶ 1 ç±»å
+car.common.prerequisite2ID = å
å³æ¡ä»¶ 2 ID
+car.common.prerequisite2Type = å
å³æ¡ä»¶ 2 ç±»å
+car.common.prerequisite3ID = å
å³æ¡ä»¶ 3 ID
+car.common.prerequisite3Type = å
å³æ¡ä»¶ 3 ç±»å
car.common.prerequisites = å
å³æ¡ä»¶
car.common.proprietary = æææ
-car.common.removePlugins = å é¤Geronimoçæ件
+car.common.removePlugins = å é¤ Geronimo çæ件
car.common.repository = åå¨åº
car.common.savePluginData = ä¿åæ件é
ç½®
-car.common.searchForPlugins = æç´¢æ件
-car.common.uniqueID = å¯ä¸çID
+car.common.searchForPlugins = æ¾ç¤ºæéä»åºä¸çæ件
+car.common.uniqueID = å¯ä¸ç ID
car.common.viewDetails = æ¾ç¤ºç»è
-car.common.webSite = Webç«ç¹
+car.common.webSite = Web ç«ç¹
car.confirmExport.title = <b>导åºæ件</b> -- ä¿åå°ç£ç
-car.confirmExport.useBtnBelow = 使ç¨ä¸é¢è¿ä¸ªæé®å°æ件"{0}"ä¿åå°ç£çã
-car.download.foundDependencies = ä¸é¢æ¯æ¾å°çè¿ä¸ªæ件çä¾èµé¡¹ãå¦æä½ ç»§ç»çè¯ï¼å°ä¼èªå¨å°å®è£
ä»»ä½ç¼ºå°çä¾èµé¡¹ã
+car.confirmExport.useBtnBelow = åå»ä¸é¢è¿ä¸ªæé®å°æ件"{0}"ä¿åå°ç£çã
+car.download.foundDependencies = æå¡å¨ä¸ºæ¤æ件æ¾å°äºä»¥ä¸ä¾èµé¡¹ãå¦æä½ ç»§ç»çè¯ï¼æå¡å¨å°ä¼èªå¨å°å®è£
æéçä¾èµé¡¹ã
car.download.processing = å¤ç{0}ä¸...
car.downloadStatus.processing = æ£å¨å¤ç{0}...
-car.help.return = åå»portlet头é¨ç'è§å¾'é¾æ¥ä»¥è¿åæ件主é¢æ¿
+car.help.return = åå»æ¤ portlet å³ä¸è§çâè§å¾âé¾æ¥ä»¥è¿åæ件主é¢æ¿
car.index.assembleServer = ç»è£
æå¡å¨
car.index.assembleServerLong = 使ç¨è¿éçæ件ç»è£
æå¡å¨
-car.index.assemblyHelp.AppCentric.desp = éæ©ç¬¦åä½ éè¦çåºç¨æä»¶å¹¶ä»¥ä½ çåºç¨æ件为ä¸å¿å®ä¹æå¡å¨çå
容ãä½ çæå¡å¨åºè¯¥è½å¤è¿è¡ä½ çåºç¨ä½å¯è½æ æ³é¨ç½²å
¶ä»ä»»ä½åºç¨ã
+car.index.assemblyHelp.AppCentric.desp = éæ©ä½ æ³è¦ç»è£
å°ä½ çæå¡å¨ä¸çåºç¨æ件ãä½ æéæ©çåºç¨æ件å°å³å®æç»è£
æå¡å¨æç»çè½è½ãä½ çæå¡å¨å°è½å¤è¿è¡ä½ çåºç¨æ件ï¼ä½å¯è½æ æ³é¨ç½²å
¶ä»ä»»ä½åºç¨ç¨åºã
car.index.assemblyHelp.AppCentric.title = 以åºç¨ä¸ºä¸å¿ç
-car.index.assemblyHelp.ExpertUser.desp = æç
§ ConfigId éæ©åºç¨æ件åç³»ç»æ件以æå»ºä½ çæå¡å¨ã请ä»
å¨ä½ æ¯ Apache Geronimo çä¸å®¶ç¨æ·æ¶éæ©è¿ä¸ªæ¨¡å¼ï¼å¦åä½ æåå¾å°çå¯è½æ¯ä¸ä¸ªæ æ³å¯å¨åé¨ç½²ä»»ä½åºç¨çæå¡å¨.
-car.index.assemblyHelp.ExpertUser.title = ä¸å®¶ç¨æ·
-car.index.assemblyHelp.FuncCentric.desp = éæ©ç¬¦åä½ éè¦çåè½ä»¥åä»»ä½å·²é¨ç½²çåºç¨æ件
+car.index.assemblyHelp.ExpertUser.desp = éæ©åºç¨æ件åç³»ç»æ件æ¥ç»è£
ä½ çæå¡å¨ã注æï¼ä½ å¿
é¡»æ¯ Apache Geronimo çä¸å®¶çº§ç¨æ·æå¯ä»¥éæ©è¿ä¸ªæ¨¡å¼ï¼å¦åä½ æåå¾å°çå¯è½æ¯ä¸ä¸ªæ æ³å¯å¨åé¨ç½²ä»»ä½åºç¨çæå¡å¨.
+car.index.assemblyHelp.ExpertUser.title = ä¸å®¶çº§ç¨æ·
+car.index.assemblyHelp.FuncCentric.desp = éæ©ç¬¦åä½ éè¦çåè½ä»¥å对åºçæ件æ¥ç»è£
æå¡å¨
car.index.assemblyHelp.FuncCentric.title = 以åè½ä¸ºä¸å¿ç
-car.index.assemblyHelp.desp = 使ç¨å½åæå¡å¨ä¸ç Geronimo æ件ç»è£
ä¸ä¸ªæå¡å¨ã请éæ©å¦ä¸ä¸ç§æ¨¡å¼ä¸çä¸ç§:
-car.index.assemblyHelp.note = <p>请注æè¿ä¸ªportletåªéç¨äºgeronimoæ件. å¦æä½ çåºç¨ä¸æ¯ä¸ä¸ªgeronimoæ件, ä½ æå¦ä¸éæ©:</p><p>- 使ç¨æ§å¶å°ç"å建æ件"portletå°ä½ çåºç¨è½¬æ¢ä¸ºä¸ä¸ªgeronimoæ件<br/>- 使ç¨car-maven-pluginå°ä½ çåºç¨è½¬æ¢ä¸ºä¸ä¸ªgeronimoæ件<br/>- ç»è£
ä½ çæå¡å¨ååé¨ç½²ä½ çåºç¨<br/></p>
+car.index.assemblyHelp.desp = å©ç¨å½åæå¡å¨ä¸ç Geronimo æ件ç»è£
ä¸ä¸ªæ°çæå¡å¨ãä½ å¯ä»¥éæ©å¦ä¸ä¸ç§æ¨¡å¼ä¸çä¸ç§:
+car.index.assemblyHelp.note = <p>请注ææ¤ portlet åªéç¨äº Geronimo æ件. å¦æä½ çåºç¨ä¸æ¯ä¸ä¸ª Geronimo æ件, ä½ æå¦ä¸éæ©:</p><p>- 使ç¨æ§å¶å°ç"å建æ件"åè½å°ä½ çåºç¨è½¬æ¢ä¸ºä¸ä¸ª Geronimo æ件<br/>- ä½¿ç¨ car-maven-plugin å°ä½ çåºç¨è½¬æ¢ä¸ºä¸ä¸ª Geronimo æ件<br/>- ç»è£
ä½ çæå¡å¨ååé¨ç½²ä½ çåºç¨<br/></p>
car.index.assemblyMode = èªå®ä¹ç»è£
模å¼:
-car.index.createGeronimoPluginExp = éæ©è¦å¯¼åºç Geronimo æ件ã导åºåçæ件å°ä»¥ CAR æ件çå½¢å¼ä¿åå°ä½ çæ¬å°æ件系ç»ä¸ã<i>注æï¼å¨ä½ å°å®å¯¼åºåï¼è¦ä½¿å®æ为ä¸ä¸ªææçæ件ï¼ä½ å¿
é¡»æå¨å°<tt>META-INF/geronimo-plugin.xml</tt>æ件添å å° CAR ä¸ã</i>
+car.index.createGeronimoPluginExp = éæ©è¦å¯¼åºç Geronimo æ件ã导åºåçæ件å°ä»¥ CAR æ件çå½¢å¼ä¿åå°ä½ çæ¬å°æ件系ç»ä¸ã<i>注æï¼å¨ä½ å°å®å¯¼åºåï¼è¦ä½¿å®æ为ä¸ä¸ªææçæ件ï¼ä½ å¿
é¡»æå¨å°<tt>META-INF/geronimo-plugin.xml</tt>æ件添å å° CAR ä¸ã</i>
car.index.createPluginHelp.desp = <p>ä»å½åGeronimo æå¡å¨ä¸å¯¼åº Geronimoæ件ã å¡«åæ件å
æ°æ®ä¿¡æ¯å¹¶å°æ件ä¿å为ä¸ä¸ª CAR æ件å°ä½ çæ¬å°æ件系ç»ãæ§å¶å°å°çæ<tt>geronimo-plugin.xml</tt>æ件以åå¨ä½ æ导åºæ件çå
æ°æ®ä¿¡æ¯å¹¶å°æ件æå
è¿ä¸ä¸ª CAR æ件ã ä½ å¯ä»¥éè¿ç®¡çæ§å¶å°è®¾ç½®å¾å¤æ件å
æ°æ®ï¼ç¶èï¼ä½ æ æ³æ´æ¹æäºé«çº§è®¾ç½®, ä¾å¦<tt>config-xml-content</tt>æè
<tt>config-substitution properties</tt>ã</p><p>å¦æä½ ä½¿ç¨å½ä»¤è¡æ¹å¼çæä¸ä¸ª Geronimo æ件,
ä½ å¯ä»¥å
ä½¿ç¨ car-maven-plugi nä¸ºä½ ç项ç®äº§çä¸ä¸ª<tt>geronimo-plugin.xml</tt>æ件, ç¶åå°ä½ ç项ç®æå
为ä¸ä¸ª CAR æ件, 并åæ¶å°ä½ ç项ç®ä¿¡æ¯èªå¨æ·»å å° Geronimo æ件ç®å½ï¼<tt>geronimo-plugins.xml</tt> æ件ï¼ã</p>
-car.index.createPluginHelp.title = å建geronimoæ件
-car.index.installPluginHelp.desp = <p>ä»æ¬å°æè¿ç¨æå¡å¨åå½åGeronimoæå¡å¨å®è£
geronimoæ件.</p> <p>ç¹å» "æ´æ°åå¨åºå表" é¾æ¥ä»¥å°åå¨åºå表æ´æ°å°æå¡å¨æ¨èçææ°ç.</p> <p>å¦æä½ æ²¡æçå°ææçåå¨åº, ç¹å» "æ·»å åå¨åº" é¾æ¥ä»¥æ·»å ä½ éæ©çéå åå¨åº. åå¨åºå¿
é¡»å¨æ ¹ç®å½æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件ååºåå¨åºä¸çå¯ç¨æ件. </p>
-car.index.installPluginHelp.title = å®è£
geronimoæ件
+car.index.createPluginHelp.title = å建 Geronimo æ件
+car.index.installPluginHelp.desp = <p>ä»æ¬å°æè¿ç¨æå¡å¨åå½å Geronimo æå¡å¨å®è£
Geronimo æ件.</p> <p>ç¹å» "æ´æ°åå¨åºå表" é¾æ¥ä»¥å°åå¨åºå表æ´æ°å°æå¡å¨æ¨èçææ°ç.</p> <p>å¦æä½ æ²¡æçå°ææçåå¨åº, ç¹å» "æ·»å åå¨åº" é¾æ¥ä»¥æ·»å ä½ éæ©çéå åå¨åº. åå¨åºå¿
é¡»å¨æ ¹ç®å½æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件ååºåå¨åºä¸çå¯ç¨æ件. </p>
+car.index.installPluginHelp.title = å®è£
Geronimo æ件
car.index.optionalAuthentication = å¯ééªè¯ä¿¡æ¯
-car.index.removePluginsExp = è¦å é¤ä¸ä¸ªæ件ï¼å¨<b>åºç¨ç¨åº</b>ä¸çç±»å«ä¸æ¾å°æ件模å并å¸è½½å®ã
-car.index.summary = <h2>å®è£
Geronimo æ件</h2> <p>è¿ä¸ªportlet ç¨äºå®è£
Geronimo æ件ã éè¿è¿æ ·å°±å¯ä»¥å¨è¿è¡æ¶ä¸º Geronimo æå¡å¨å®è£
æ°çåè½ã</p> <p>éæ©ä¸ä¸ªæ¬å°æè¿ç¨çåå¨åºå¹¶æ£æ¥å¯ç¨çGeronimoæ件ã è¿ä¸ªåå¨åºçæ ¹ç®å½ä¸å¿
é¡»æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件以æ¾ç¤ºåå¨åºä¸çææå¯ç¨æ件ã</p> <p>ä½ ä¹å¯ä»¥ä»å
¶å®Geronimoæå¡å¨ä¸è½½è¿è¡ä¸ç设置就åæµè§åå®è£
第3æ¾æ件ä¸æ ·. å¦æä½ æ³æåä¸ä¸ªè¿ç¨çGeronimoæå¡å¨, è¾
å
¥ä¸ä¸ªURL,类似äº<tt>http://geronimo-server:8080/plugin/maven-repo/</tt>并å¨å¯éçéªè¯åä¸è¾å
¥ç®¡çåçç¨æ·ååå¯ç .</p>
+car.index.removePluginsExp = è¦å é¤ä¸ä¸ªæ件ï¼å¨<b>åºç¨ç¨åº</b> portlet ä¸æ¾å°æ件模å并å°å®å¸è½½ã
+car.index.summary = <h2>å®è£
Geronimo æ件</h2> <p>è¿ä¸ª portlet ç¨äºå®è£
Geronimo æ件ã éè¿è¿æ ·å°±å¯ä»¥å¨è¿è¡æ¶ä¸º Geronimo æå¡å¨å®è£
æ°çåè½ã</p> <p>éæ©ä¸ä¸ªæ¬å°æè¿ç¨çåå¨åºå¹¶æ£æ¥å¯ç¨çGeronimoæ件ã è¿ä¸ªåå¨åºçæ ¹ç®å½ä¸å¿
é¡»æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件以æ¾ç¤ºåå¨åºä¸çææå¯ç¨æ件ã</p> <p>ä½ ä¹å¯ä»¥ä»å
¶å® Geronimo æå¡å¨ä¸è½½è¿è¡ä¸ç设置就åæµè§åå®è£
第ä¸æ¹æ件ä¸æ ·. å¦æä½ æ³æåä¸ä¸ªè¿ç¨ç Geronimo æå¡å
¨, è¾å
¥ä¸ä¸ª URL ,类似äº<tt>http://geronimo-server:8080/plugin/maven-repo/</tt>并å¨å¯éçéªè¯åä¸è¾å
¥ç®¡çåçç¨æ·ååå¯ç .</p>
car.index.updateRepositoryList = æ´æ°åå¨åºå表
car.index.validateConfig = 请éæ©è¦å¯¼åºç设置.
car.list.PluginGroup = æ¬å°æå¡å¨çæ件ç»:
car.list.applicationPlugin = æ¬å°æå¡å¨çåºç¨æ件:
-car.list.assemblyArtifactId = æ°æå¡å¨å·¥ä»¶ID:
+car.list.assemblyArtifactId = æ°æå¡å¨å·¥ä»¶ ID:
car.list.assemblyFormat = æ°æå¡å¨æ ¼å¼:
-car.list.assemblyGroupId = æ°æå¡å¨ç»ID:
+car.list.assemblyGroupId = æ°æå¡å¨ç» ID:
car.list.assemblyPath = æ°æå¡å¨ä¿åè·¯å¾:
car.list.assemblyVersion = æ°æå¡å¨çæ¬:
car.list.expertUser = ä¸å®¶ç¨æ·(æ¾ç¤ºææç³»ç»æ件)
@@ -100,11 +100,11 @@
car.list.noPlugins = æ¤åå¨åºä¸æ²¡ææ件.
car.list.nothing = ä½ è³å°è¦éæ©ä¸ä¸ªæ件以å®è£
ã
car.list.pluginRepo = æ件ä½äº
-car.list.requireArtifactId = ä½ å¿
é¡»æä¾å·¥ä»¶IDã
+car.list.requireArtifactId = ä½ å¿
é¡»æä¾å·¥ä»¶ IDã
car.list.requiredPlugin = æ¬å°æå¡å¨æéæ件:
car.list.selectPlugin = ä»å½åæå¡å¨éæ©æ件:
car.list.systemPlugin = æ¬å°æå¡å¨çç³»ç»æ件:
-car.pluginParams.JVMVersionsExp = ä¸ä¸ªå¯éçå表ï¼ç¨äºååºè¿ä¸ªæ件æ¯æçJVMçæ¬çåç¼ãå¦æ没æååºä»»ä½å¼çè¯ï¼è¿ä¸ªæ件å¯å®è£
å¨è¿è¡äºä»»ä½çæ¬çJVMçGeronimoä¸ãä¸ç¶çè¯ï¼æ¯ä¸è¡ååºä¸ä¸ªå¯æ¥åçJVMçæ¬åç¼ï¼å°±å"1.4.2 1.5 ..." (å½ç¶ï¼çæ³æ
åµä¸ï¼è¿æå³çå¨è¿éååºçJVNçæ¬ä¸ï¼ä½ ç¡®å®å·²ç»æµè¯è¿è¿ä¸ªæ件)ã
+car.pluginParams.JVMVersionsExp = ä¸ä¸ªå¯éçå表ï¼ç¨äºååºè¿ä¸ªæ件æ¯æçJVMçæ¬çåç¼ãå¦æ没æååºä»»ä½å¼çè¯ï¼è¿ä¸ªæ件å¯å®è£
å¨è¿è¡äºä»»ä½çæ¬çJVMçGeronimoä¸ãä¸ç¶çè¯ï¼æ¯ä¸è¡ååºä¸ä¸ªå¯æ¥åç JVM çæ¬åç¼ï¼å°±å"1.4.2 1.5 ..." (å½ç¶ï¼çæ³æ
åµä¸ï¼è¿æå³çå¨è¿éååºç JVM çæ¬ä¸ï¼ä½ ç¡®å®å·²ç»æµè¯è¿è¿ä¸ªæ件)ã
car.pluginParams.authorExp = æ件çä½è
ï¼è¿å¯è½æ¯äººåï¼å
¬å¸åæè
å¼æºé¡¹ç®çå称ççã
car.pluginParams.categoryExp = è¿ä¸ªæ件æå±çç±»å«ãåä¸ä¸ªç±»å«çæ件ä¼è¢«ä¸èµ·ååºãå¦ææ³è®©è¿ä¸ªæ件被åå¨ geronimoplugins.com ï¼ä½ åºè¯¥éæ©å
¶ä¸çä¸ä¸ªç±»å«ä½ä¸ºå称ãå¦å¤ï¼ä½ ä¹å¯ä»¥éæå°éæ©ç±»å«çå称ï¼æè
éç¨åå¨åºä¸å®è¦è¢«åå¸è³çé£ä¸ä¸ªç±»å«çå称ã
car.pluginParams.dependenciesExp = ä¸ä¸ªå表ï¼ç¨äºååºè¿ä¸ªæ件æä¾èµç JAR å
æå
¶ä»æ¨¡åç IDãå®è£
è¿ä¸ªæ件æ¶ï¼è¿äºä¾èµé¡¹å°ä¼èªå¨å°å®è£
ãé常ï¼ä½ ä¸åºè¯¥ä¿®æ¹è¿ä¸ªå表ãç¶èï¼å¦æç¨æ·å¨å®è£
è¿ä¸ªæ件åï¼å¿
é¡»å
æå¨å°å®è£
æ个ä¾èµé¡¹ï¼ä½ å¯ä»¥å°è¯¥ä¾èµé¡¹ä»ä¾èµå表ä¸ç§»å°<b>å
å³æ¡ä»¶</b>å表ä¸(ä¾å¦ï¼æ°æ®åºè¿æ¥æ± ï¼æ件æ¯æ æ³ç¥éè¦è¿æ¥å°åªä¸ªæå¡å¨ç)ã<br /><br />å¨è¿ä¸ªå表ä¸çæ¯ä¸ä¸ªæ¡
ç®åºè¯¥ä½¿ç¨åä¸é¢ä¸æ ·çå¯ä¸ ID ãå¦æä½ è®¤ä¸ºè¿ä¸ªæ件å¯ä»¥ä½¿ç¨ä»»ä½çæ¬çä¾èµé¡¹ï¼ä½ ä¹å¯ä»¥å é¤æçæ¬å·ï¼ä½è¿æ ·åå¯è½ä¼æé£é©ãæ¯ä¸ªä¾èµé¡¹åºè¯¥å¯¹åºä¸è¡å
容ã
@@ -116,23 +116,23 @@
car.pluginParams.licenseExp = è¿ä¸ªæ件使ç¨ç许å¯è¯ãçæ³æ
åµï¼å®åºè¯¥æ¯åç¼ä¸º BSD æè
GPL ç±»åç许å¯è¯ã
car.pluginParams.obsoletesExp = ä¸ä¸ªå表ï¼ç¨äºååºè¦è¢«è¯¥æ件æ¿æ¢ç模å IDãå½å®è£
è¿ä¸ªæ件æ¶ï¼è¿éååºç模åææ件ä¼è¢«å é¤ãå¦æä½ è¦å级èä¸æ¯æ¿æ¢åæçæ件ï¼å¯ä»¥å¨è¿éæä¾åææ件ççæ¬ä¿¡æ¯ãå表ä¸çæ¯ä¸è¡å¯¹åºä¸ä¸ªæ¨¡å IDã
car.pluginParams.openSourceExp = å¦æè¿ä¸ªè®¸å¯è¯æ¯æç±» OSI 认å¯çå¼æºè®¸å¯è¯çè¯ï¼éä¸è¿ä¸ªå¤éæ¡(åè<a href="http://www.opensource.org/licenses/index.php">http://www.opensource.org/licenses/index.php</a>)ã
-car.pluginParams.pluginURLExp = å¯ä»¥è·å¾æ件æ´å¤ä¿¡æ¯çURL(å¦æ件ç主页)ã
+car.pluginParams.pluginURLExp = å¯ä»¥è·å¾æ件æ´å¤ä¿¡æ¯ç URL (å¦æ件ç主页)ã
car.pluginParams.prereqDescriptionExp = ä¸æ®µè¾ä¸ºè¯¦å°½çæè¿°ï¼å
³äºç¨æ·è¦æ»¡è¶³âå
å³æ¡ä»¶âæå¿
é¡»è¦åçäºæ
ãï¼ä¾å¦ä¸äºå
³äºè®¾ç½®æ°æ®åºè¿æ¥æ± ç说æï¼ååºå¯æ¯æçæ°æ®åºäº§å并ä¸åè¯ç¨æ·å¨åªéè½æ¾å°åå§åæ°æ®åºçèæ¬ï¼ãè¿éåºè¯¥ä½¿ç¨ç¨ç©ºè¡åå²æ段è½çæ®éææ¬ã
car.pluginParams.prerequisiteIDExp = ä½ä¸ºè¿ä¸ªæ件å
å³æ¡ä»¶ç模å IDãå¨æ件被å®è£
ä¹åï¼æå¡å¨ä¸å¿
须已ç»åå¨è¿ä¸ªæ¨¡åãå¯è½æ¯æ个 Web åºç¨æéçç¹å® Web 容å¨(<tt>geronimo/jetty/*/car</tt>)ãæ°æ®åºè¿æ¥æ± æè
å®å
¨åä¿¡æ¯ãç±äºæ件çä½è
æ æ³ä¸ºç®æ æå¡å¨å建对åºäºè¿äºä¿¡æ¯çææå¼ï¼å æ¤ç¨æ·å¿
é¡»æå·¥é
ç½®ã为äºéåºå°½å¯è½å¤çç¨æ·éæ±ï¼ä½ å¯è½éè¦çç¥æ¨¡å ID ä¸çæäºå
容ï¼å¦ä½¿ç¨ <tt>*/mypool/*/*</tt> èä¸æ¯ <tt>myapp/
mypool/1.2/car</tt>ï¼ã
car.pluginParams.prerequisiteTypeExp = 为äºæ¹ä¾¿ç¨æ·ï¼å¯¹å
å³æ¡ä»¶çç±»åçç®çæè¿°ãå¯åçå¼å
æ¬<tt>Database Pool</tt> ï¼<tt>Web Container</tt>ççã
car.pluginParams.title = <b>导åºæ件</b> -- é
ç½®æ件
-car.pluginParams.uniqueIDExp = è¿ä¸ªæ件å
¨å±å¯ä¸çIDï¼è¿æ¯ç±ä½ è¦å¯¼åºçæå¡å¨å³å®çãè¿ä¸ªIDç¡®å®äºæ件ççæ¬å·ï¼æ以请确ä¿ä½ è¾å
¥çIDçæ£ç¡®æ§ã
+car.pluginParams.uniqueIDExp = è¿ä¸ªæ件å
¨å±å¯ä¸ç IDï¼è¿æ¯ç±ä½ è¦å¯¼åºçæå¡å¨å³å®çãè¿ä¸ª ID ç¡®å®äºæ件ççæ¬å·ï¼æ以请确ä¿ä½ è¾å
¥ç ID çæ£ç¡®æ§ã
car.results.filesProcessed = å·²å¤çæ件
car.results.titles = å·²å®è£
å¦ä¸æ件
car.viewForDownload.author = ä½è
car.viewForDownload.category = ç±»å«
car.viewForDownload.dependencies = ä¾èµ
car.viewForDownload.description = æè¿°
-car.viewForDownload.geronimoVersions = Geronimoçæ¬
+car.viewForDownload.geronimoVersions = Geronimo çæ¬
car.viewForDownload.installable = å¯å®è£
ç
-car.viewForDownload.jvmVersions = JVMçæ¬
+car.viewForDownload.jvmVersions = JVM çæ¬
car.viewForDownload.license = 许å¯è¯
-car.viewForDownload.moduleId = 模åID
+car.viewForDownload.moduleId = 模å ID
car.viewForDownload.obsoletes = åºå¼
car.viewForDownload.prerequisites = å
å³æ¡ä»¶
car.viewForDownload.website = ç«ç¹
@@ -148,13 +148,13 @@
configmanager.deploy.showDetail = æ¾ç¤ºå®æ´ä¿¡æ¯
configmanager.deploy.showMigratedPlan = æ¾ç¤ºè¿ç§»åç计å
configmanager.deploy.showOriginalPlan = æ¾ç¤ºåå§é¨ç½²è®¡å
-configmanager.deployHelp.archiveExp = æµè§ç³»ç»æ¥éæ©warå
ã
-configmanager.deployHelp.installApplication = å®è£
åºç¨å°Geronimoæå¡å¨ã
-configmanager.deployHelp.planExp = å¦æé¨ç½²è®¡å没æ被æå
å¨warå
ä¸ï¼é£ä¹ç¹å»"æµè§"æé®æ¥éæ©é¨ç½²è®¡åã
+configmanager.deployHelp.archiveExp = æµè§ç³»ç»æ¥éæ© WAR å
ã
+configmanager.deployHelp.installApplication = å®è£
åºç¨å° Geronimo æå¡å¨ã
+configmanager.deployHelp.planExp = å¦æé¨ç½²è®¡å没æ被æå
å¨ WAR å
ä¸ï¼é£ä¹ç¹å»"æµè§"æé®æ¥éæ©é¨ç½²è®¡åã
configmanager.deployHelp.startAppAfterInstallExp = éä¸è¿ä¸ªå¤éæ¡ï¼ä¼å¨åºç¨å®è£
åèªå¨å¯å¨å®ãå¦åï¼ç¨æ·éè¦å¨"å·²å®è£
åºç¨"çªå£ä¸ç¹å»ç¸åºç"å¯å¨"é¾æ¥æ¥å¯å¨åºç¨ãé»è®¤æ
åµä¸ï¼è¿ä¸ªå¤éæ¡è¢«éä¸ï¼ä¼èªå¨å°å¯å¨æ°å®è£
çåºç¨ã
-configmanager.deployHelp.title = è¿ä¸ª portlet å
许ç¨æ·é¨ç½²æ°åºç¨å° Geronimo ä¸ãWeb åºç¨éè¦é¨ç½²è®¡åï¼é¨ç½²è®¡åå¯ä»¥è¢«æå
å¨ war å
ä¸ï¼æè
ä¿åå¨ä¸ä¸ªç¬ç«çé常åå为geronimo-web.xmlçæ件ä¸ã
+configmanager.deployHelp.title = è¿ä¸ª portlet å
许ç¨æ·é¨ç½²æ°åºç¨å° Geronimo ä¸ãWeb åºç¨éè¦é¨ç½²è®¡åï¼é¨ç½²è®¡åå¯ä»¥è¢«æå
å¨ WAR å
ä¸ï¼æè
ä¿åå¨ä¸ä¸ªç¬ç«çé常åå为 geronimo-web.xml çæ件ä¸ã
-consolebase.common.JVMVersions = JVMçæ¬
+consolebase.common.JVMVersions = JVM çæ¬
consolebase.common.actions = æä½
consolebase.common.cancel = åæ¶
consolebase.common.commands = å½ä»¤
@@ -181,14 +181,14 @@
consolebase.common.user = ç¨æ·
consolebase.common.userName = ç¨æ·å
-realmwizard._sql.JDBCDriverClassExp = JDBC 驱å¨ç±»çå®å
¨éå®åãè¦æ±é©±å¨ç±»å¿
é¡»è½å¨ä¸ä¸ä¸ªå段æå®çJARå
ä¸æ¾å°ã
+realmwizard._sql.JDBCDriverClassExp = JDBC 驱å¨ç±»çå®å
¨éå®åãè¦æ±é©±å¨ç±»å¿
é¡»è½å¨ä¸ä¸ä¸ªå段æå®ç JAR å
ä¸æ¾å°ã
realmwizard._sql.JDBCPasswordExp = è¿æ¥æ°æ®åºçå¯ç
realmwizard._sql.JDBCUrlExp = JDBC URL æå®äºè¦è¿æ¥æ°æ®åºæ¶çç»èã对äºä¸åç JDBC 驱å¨ï¼æ ¼å¼å°ææä¸åã
realmwizard._sql.JDBCUsernameExp = è¿æ¥æ°æ®åºçç¨æ·å
realmwizard._sql.databasePoolExp = ç»å½æ¨¡åç¨æ¥è¿æ¥æ°æ®åºçæ°æ®åºè¿æ¥æ± ãå¦ææå®äºæ°æ®åºè¿æ¥æ± çè¯ï¼ä¸é¢çå
¶å®è®¾ç½®é½ä¸æ¯å¿
é¡»çã
realmwizard._sql.digestAlgorithmExp = 对äºæ¤å£ä»¤è¦ä½¿ç¨çæ¶æ¯æè¦ç®æ³ (ä¾å¦ MD5, SHA1 ç). å¦æä¸ä½¿ç¨æ¶æ¯æè¦ç®æ³ï¼è¯·ä½¿æ¤å¼ä¸ºç©ºã
realmwizard._sql.digestEncodingExp = 对æè¦çç¼ç (ä¾å¦ hex, base64). ä»
å½æå®äºæ¶æ¯æè¦ç®æ³æ¶ä½¿ç¨ãå¦æä¸ç¥éç¼ç ç®æ³ï¼ä¼é»è®¤ä½¿ç¨hexç®æ³ã
-realmwizard._sql.driverJARExp = å
å«éå® JDBC 驱å¨ç JAR å
ãå¿
é¡»å®è£
å°GERONIMO/repository/ç®å½åæä¼å¨å表ä¸æ¾ç¤ºã
+realmwizard._sql.driverJARExp = å
å«éå® JDBC 驱å¨ç JAR å
ãå¿
é¡»å®è£
å° GERONIMO/repository/ ç®å½åæä¼å¨å表ä¸æ¾ç¤ºã
realmwizard._sql.eitherPoolOrJDBC = SQL å®å
¨åå¿
é¡»éè¿æ°æ®åºè¿æ¥æ± æè
JDBC è¿æ¥æ¥è¿å°æ°æ®åºã请éæ©æ¯ä½¿ç¨æ°æ®åºè¿æ¥æ± ï¼è¿æ¯ä½¿ç¨JDBCã
realmwizard._sql.groupSelectSQLExp = ç¨æ¥è·å¾ç¨æ·æå±ç»çä¿¡æ¯ãè¿ä¸ªè¯å¥åºè¯¥è¿å两åå¼ï¼ç¬¬ä¸åæ¯ç¨æ·åï¼ç¬¬äºåæ¯ç»åãè¿ä¸ªè¯å¥å¯ä»¥ä½¿ç¨ PreparedStatement è¯æ³ï¼ç¨?æ¥è¡¨ç¤ºåæ°ãä¸ä¸ªå
¸åçè®¾ç½®æ¯ <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt>æè
ï¼ä¸ºäºè·å¾æ´å è§èç模å¼ï¼å¯ç¨<tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt>ã
realmwizard._sql.selectDatabasePool = SQL å®å
¨åå¿
é¡»éè¿æ°æ®åºè¿æ¥æ± æè
JDBC è¿æ¥æ¥è¿å°æ°æ®åºã请éæ©æ¯ä½¿ç¨æ°æ®åºè¿æ¥æ± ï¼è¿æ¯ä½¿ç¨JDBCã
@@ -205,12 +205,12 @@
realmwizard.advanced.namedCredential = Named Credential
realmwizard.advanced.storePasswordEnabledExp = å¦æå¯ç¨ï¼æ¯ä¸ªç¨æ·çå¯ç ä¼ä¿åå¨Subjectçç§æcredentialä¸ãè¿å°å
许å¨ç»å½å®æ以åï¼å¯ä»¥å¾å°å¯ç ã è¿é常ä¸æ¯å¿
é¡»çã
realmwizard.advanced.title = <b>å建å®å
¨å</b> -- æ¥éª¤3:é«çº§é
ç½®é项
-realmwizard.common.JDBCDriverClass = JDBC驱å¨ç±»
-realmwizard.common.JDBCPassword = JDBCå¯ç
+realmwizard.common.JDBCDriverClass = JDBC 驱å¨ç±»
+realmwizard.common.JDBCPassword = JDBC å¯ç
realmwizard.common.JDBCUrl = JDBC URL
-realmwizard.common.JDBCUsername = JDBCç¨æ·å
+realmwizard.common.JDBCUsername = JDBC ç¨æ·å
realmwizard.common.addSecurityRealm = æ·»å æ°çå®å
¨å
-realmwizard.common.addToEAR = æ·»å å°EARä¸
+realmwizard.common.addToEAR = æ·»å å° EAR ä¸
realmwizard.common.comfirmPwd = 确认å¯ç
realmwizard.common.configurationOptions = é
ç½®é项
realmwizard.common.controlFlag = æ§å¶æ å¿
@@ -221,7 +221,7 @@
realmwizard.common.deploymentPlan = é¨ç½²è®¡å
realmwizard.common.digestAlgorithm = æè¦ç®æ³
realmwizard.common.digestEncoding = æè¦ç¼ç
-realmwizard.common.driverJAR = 驱å¨JAR
+realmwizard.common.driverJAR = é©±å¨ JAR
realmwizard.common.editRealm = ç¼è¾å®å
¨å
realmwizard.common.editSettings = ç¼è¾è®¾ç½®
realmwizard.common.emptyText = ç¦ç¹æå¨å段ä¸è½ä¸ºç©ºã
@@ -248,76 +248,76 @@
realmwizard.common.testAgain = å次æµè¯
realmwizard.common.testLogin = æµè¯ç»å½
realmwizard.common.userSelectSQL = User SELECT SQL
-realmwizard.configure.certprops.groupsURI.description = å
å«ç»ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äºGeronimo家ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯ <tt>group=user,user,...</tt>ã
-realmwizard.configure.certprops.groupsURI.name = ç»æ件URI
-realmwizard.configure.certprops.usersURI.description = å
å«è¯ä¹¦å°ç¨æ·çæ å°ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äºGeronimo家ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯<tt>username=certificatename</tt>ï¼å
¶ä¸è¯ä¹¦å为<tt>X509Certificate.getSubjectX500Principal().getName()</tt>ã
-realmwizard.configure.certprops.usersURI.name = ç¨æ·æ件URI
+realmwizard.configure.certprops.groupsURI.description = å
å«ç»ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äº Geronimo å®è£
ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯ <tt>group=user,user,...</tt>ã
+realmwizard.configure.certprops.groupsURI.name = ç»æ件 URI
+realmwizard.configure.certprops.usersURI.description = å
å«è¯ä¹¦å°ç¨æ·çæ å°ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äº Geronimo å®è£
ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯<tt>username=certificatename</tt>ï¼å
¶ä¸è¯ä¹¦å为<tt>X509Certificate.getSubjectX500Principal().getName()</tt>ã
+realmwizard.configure.certprops.usersURI.name = ç¨æ·æ件 URI
realmwizard.configure.ldap.authentication.description = 使ç¨çå®å
¨çº§å«ï¼å¯ä»¥æ¯<tt>none</tt>, <tt>simple</tt>, æè
<tt>strong</tt>(é常çå¼æ¯<tt>simple</tt>ãå¦æä¸æå®è¿ä¸ªå±æ§ï¼è¡ä¸ºç±æå¡ä¾åºåå³å®ã
realmwizard.configure.ldap.authentication.name = éªè¯
-realmwizard.configure.ldap.connectionPassword.description = ç¨äºè¿æ¥LDAPæå¡å¨çå¯ç ã
+realmwizard.configure.ldap.connectionPassword.description = ç¨äºè¿æ¥ LDAP æå¡å¨çå¯ç ã
realmwizard.configure.ldap.connectionPassword.name = è¿æ¥å¯ç
-realmwizard.configure.ldap.connectionProtocol.description = ç¨äºä¸LDAPæå¡å¨è¿è¡éä¿¡çè¿æ¥åè®®ãé常ç空ï¼å°½ç®¡å¦ææå¡å¨æ¯æçè¯å¯ä»¥å°å®è®¾ä¸º<tt>ssl</tt>ã
+realmwizard.configure.ldap.connectionProtocol.description = ç¨äºä¸ LDAP æå¡å¨è¿è¡éä¿¡çè¿æ¥åè®®ãé常ç空ï¼å¦ææå¡å¨æ¯æçè¯å¯ä»¥å°å®è®¾ä¸º<tt>ssl</tt>ã
realmwizard.configure.ldap.connectionProtocol.name = è¿æ¥åè®®
-realmwizard.configure.ldap.connectionURL.description = æè¿°å¦ä½è¿æ¥å°LDAPæå¡å¨çURLãé常è¿ä¼æ¯<tt>ldap://ldap-server-hostname:389</tt>(æè
对äºå
å«å¨Geronimoä¸çApacheç®å½æå¡å¨ï¼åæ¯<tt>ldap://localhost:1389</tt>)ã
-realmwizard.configure.ldap.connectionURL.name = è¿æ¥URL
-realmwizard.configure.ldap.connectionUsername.description = ç¨äºè¿æ¥å°LDAPæå¡å¨çç¨æ·åãè¿åºè¯¥æ¯ä¸ä¸ªç®¡çåæè
ç®å½ç®¡çè
ï¼ä»æææ£æ¥å
¶ä»ç¨æ·çå¯ç ã
+realmwizard.configure.ldap.connectionURL.description = LDAP æå¡å¨ç URLãé常è¿ä¼æ¯<tt>ldap://ldap-server-hostname:389</tt>(æè
对äºå
å«å¨ Geronimo ä¸ç Apache ç®å½æå¡å¨ï¼ä¸º<tt>ldap://localhost:1389</tt>)ã
+realmwizard.configure.ldap.connectionURL.name = è¿æ¥ URL
+realmwizard.configure.ldap.connectionUsername.description = ç¨äºè¿æ¥å° LDAP æå¡å¨çç¨æ·åãè¿åºè¯¥æ¯ä¸ä¸ªç®¡çåæè
ç®å½ç®¡çè
ï¼ä»æææ£æ¥å
¶ä»ç¨æ·çå¯ç ã
realmwizard.configure.ldap.connectionUsername.name = è¿æ¥ç¨æ·å
-realmwizard.configure.ldap.initialContextFactory.description = åå§ä¸ä¸æå·¥åçå®æ´éå®ç±»åãå¦æä½ ä¸ç¥éè¿é该ç¨ä»ä¹ï¼è¯·ä½¿ç¨<tt>com.sun.jndi.ldap.LdapCtxFactory</tt>ã
+realmwizard.configure.ldap.initialContextFactory.description = åå§ä¸ä¸æå·¥åçå®æ´éå®ç±»åãå¦æä½ ç¡®å®åºè¯¥ç¨ä»ä¹å¼ï¼å¯ä»¥ä½¿ç¨<tt>com.sun.jndi.ldap.LdapCtxFactory</tt>ã
realmwizard.configure.ldap.initialContextFactory.name = åå§ä¸ä¸æå·¥å
-realmwizard.configure.ldap.roleBase.description = æç´¢è§è²çåºç¡LDAPä¸ä¸æ(ä½ç½®)ãæç´¢å¯è½åªæ¥æ¾è¯¥ä½ç½®ï¼æè
è¿å
æ©åä¸ä¸æï¼è¿å°åå³äºä¸é¢ç"è§è²æç´¢åæ "设å®ã
+realmwizard.configure.ldap.roleBase.description = æç´¢è§è²çåºç¡ LDAP ä¸ä¸æ(ä½ç½®)ãæç´¢å¯è½åªæ¥æ¾è¯¥ä½ç½®ï¼æè
è¿å
æ©åä¸ä¸æï¼è¿å°åå³äºä¸é¢ç"è§è²æç´¢åæ "设å®ã
realmwizard.configure.ldap.roleBase.name = è§è²åºç¡
-realmwizard.configure.ldap.roleName.description = 对åºè§è²å称çLDAPå±æ§ç±»åã常常设为<tt>cn</tt>ã
+realmwizard.configure.ldap.roleName.description = 对åºè§è²å称ç LDAP å±æ§ç±»åã常常设为<tt>cn</tt>ã
realmwizard.configure.ldap.roleName.name = è§è²å称
-realmwizard.configure.ldap.roleSearchMatching.description = è§è²ç¨äºæ¥æ¾å±äºè¯¥è§è²çç¨æ·çLDAPå±æ§æç´¢å符串ãå½è§è²æå¾å¤ç¸åå称ä½åå¼ä¸åçå±æ§æ¶(æ¯ä¸ªç¨æ·ä¸ä¸ª)使ç¨å®ãé常使ç¨åæ°<tt>{0}</tt>æ¥æ è¯ç¨æ·åãå
¸åå¼å¯è½ä¸º<tt>(member={0})</tt>æè
<tt>(memberUID={0})</tt>ã
+realmwizard.configure.ldap.roleSearchMatching.description = è§è²ç¨äºæ¥æ¾å±äºè¯¥è§è²çç¨æ·ç LDAP å±æ§æç´¢å符串ãå½è§è²æå¾å¤ç¸åå称ä½åå¼ä¸åçå±æ§æ¶(æ¯ä¸ªç¨æ·ä¸ä¸ª)使ç¨å®ãé常使ç¨åæ°<tt>{0}</tt>æ¥æ è¯ç¨æ·åãå
¸åå¼å¯è½ä¸º<tt>(member={0})</tt>æè
<tt>(memberUID={0})</tt>ã
realmwizard.configure.ldap.roleSearchMatching.name = è§è²ç¨æ·æç´¢å符串
realmwizard.configure.ldap.roleSearchSubtree.description = å¦æ设为<tt>true</tt>ï¼å"è§è²åºç¡"ä¸é¢çåæ ä¹å°è¢«æ索以æ¥æ¾è§è²ãå¦æ设为<tt>false</tt>ï¼ååªæ"è§è²åºç¡"ä½ç½®æ¬èº«ä¼è¢«æç´¢ã
realmwizard.configure.ldap.roleSearchSubtree.name = è§è²æç´¢åæ
-realmwizard.configure.ldap.userBase.description = æç´¢ç¨æ·çåºç¡LDAPä¸ä¸æ(ä½ç½®)ãæç´¢å¯è½åªæ¥æ¾è¯¥ä½ç½®ï¼æè
è¿å
æ©åä¸ä¸æï¼è¿å°åå³äºä¸é¢ç"ç¨æ·æç´¢åæ "设å®ã
+realmwizard.configure.ldap.userBase.description = æç´¢ç¨æ·çåºç¡ LDAP ä¸ä¸æ(ä½ç½®)ãæç´¢å¯è½åªæ¥æ¾è¯¥ä½ç½®ï¼æè
è¿å
æ©åä¸ä¸æï¼è¿å°åå³äºä¸é¢ç"ç¨æ·æç´¢åæ "设å®ã
realmwizard.configure.ldap.userBase.name = ç¨æ·åºç¡
realmwizard.configure.ldap.userRoleName.description = å¦æè§è²æ¡ç®æ²¡æé对ç¨æ·çå±æ§ï¼èç¨æ·æ¡ç®æä¸ä¸ªé对è§è²çå±æ§ï¼ååºè¯¥ä½¿ç¨å®èä¸æ¯"è§è²ç¨æ·æç´¢å符串"ãå®å½åäºç¨æ·ä¸çå±æ§ï¼è¯¥å±æ§ååºäºä¸ä¸ªè§è²ï¼è¿ä¸ªè§è²å
å«äºè¯¥ç¨æ·ãå
¸åå¼å¯è½æ¯<tt>(memberOf={0})</tt>ã
realmwizard.configure.ldap.userRoleName.name = ç¨æ·è§è²æç´¢å符串
-realmwizard.configure.ldap.userSearchMatching.description = æ¯ç¨äºæ¥æ¾ç¨æ·çLDAPå±æ§æç´¢å符串ãå
许RFC 2254è¿æ»¤å¨ï¼ä¸é常使ç¨åæ°<tt>{0}</tt>æ¥æ è¯ç¨æ·åãå
¸åå¼å¯è½ä¸º<tt>(uid={0})</tt>æè
<tt>(cn={0})</tt>ã
+realmwizard.configure.ldap.userSearchMatching.description = æ¯ç¨äºæ¥æ¾ç¨æ·ç LDAP å±æ§æç´¢å符串ãå
许 RFC-2254 è¿æ»¤å¨ï¼ä¸é常使ç¨åæ°<tt>{0}</tt>æ¥æ è¯ç¨æ·åãå
¸åå¼å¯è½ä¸º<tt>(uid={0})</tt>æè
<tt>(cn={0})</tt>ã
realmwizard.configure.ldap.userSearchMatching.name = ç¨æ·æç´¢å¹é
realmwizard.configure.ldap.userSearchSubtree.description = å¦æ设为<tt>true</tt>ï¼å"ç¨æ·åºç¡"ä¸é¢çåæ ä¹å°è¢«æ索以æ¥æ¾ç¨æ·ãå¦æ设为<tt>false</tt>ï¼ååªæ"ç¨æ·åºç¡"ä½ç½®æ¬èº«ä¼è¢«æç´¢ã
realmwizard.configure.ldap.userSearchSubtree.name = ç¨æ·æç´¢åæ
-realmwizard.configure.props.digest.description = ç¨å¨å¯ç ä¸çæ¶æ¯æè¦ç®æ³(ä¾å¦ï¼MD5, SHA1çç)ãå¦æä¸ä½¿ç¨æè¦ç®æ³åå°è¯¥å段ç空ã
+realmwizard.configure.props.digest.description = ç¨å¨å¯ç ä¸çæ¶æ¯æè¦ç®æ³(ä¾å¦ï¼MD5, SHA1 ç)ãå¦æä¸ä½¿ç¨æè¦ç®æ³åå°è¯¥å段ç空ã
realmwizard.configure.props.digest.name = æè¦ç®æ³
realmwizard.configure.props.encoding.description = æè¦ä½¿ç¨çç¼ç (ä¾å¦ï¼hex, base64)ãåªææå®äºæ¶æ¯æè¦ç®æ³æ使ç¨å®ãå¦æ没ææå®ç¼ç ï¼å使ç¨hexã
realmwizard.configure.props.encoding.name = æè¦ç¼ç
-realmwizard.configure.props.groupsURI.description = å
å«ç»ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äºGeronimo家ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯ <tt>group=user,user,...</tt>ã
-realmwizard.configure.props.groupsURI.name = ç»æ件URI
-realmwizard.configure.props.usersURI.description = å
å«ç¨æ·/å¯ç ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äºGeronimo家ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯<tt>username=password</tt>ã
-realmwizard.configure.props.usersURI.name = ç¨æ·æ件URI
-realmwizard.configure.title = <b>å建å®å
¨å</b> --æ¥éª¤ 2:é
ç½®ç»å½æ¨¡å
+realmwizard.configure.props.groupsURI.description = å
å«ç»ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äº Geronimo å®è£
ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯ <tt>group=user,user,...</tt>ã
+realmwizard.configure.props.groupsURI.name = ç»æ件 URI
+realmwizard.configure.props.usersURI.description = å
å«ç¨æ·/å¯ç ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äº Geronimo å®è£
ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯<tt>username=password</tt>ã
+realmwizard.configure.props.usersURI.name = ç¨æ·æ件 URI
+realmwizard.configure.title = <b>å建å®å
¨å</b> --æ¥éª¤ 2 :é
ç½®ç»å½æ¨¡å
realmwizard.edit.configurationOptionsExp = ç»å½æ¨¡åå¿
é¡»çä»»ä½é
ç½®é项ï¼ä»¥æ åçJavaå±æ§æä»¶æ ¼å¼ï¼ä¸è¡ä¸ä¸ªï¼å¦ï¼<tt>name=value</tt>ï¼
realmwizard.edit.controlFlagExp = ç»å½æ¨¡åçæ§å¶æ å¿ï¼ç¨æ¥æ§å¶å½ç»å½æ¨¡åæåæ失败æ¶ï¼æ»çç»å½è¿ç¨ä¼ææ ·ãæ´è¯¦ç»çä¿¡æ¯ï¼è¯·ç
realmwizard.edit.ifLeaveBlank = å¦æä½ ä¸éè¦ä½¿ç¨ä¸åææçç»å½æ¨¡åï¼åªéè¦æé¢å¤ç模åç空å³å¯ã
-realmwizard.edit.loginDomainExp = è¿ä¸ªç»å½æ¨¡å对åºçç»å½åï¼æ¨¡åå称å¨å®å
¨åçææ模åä¸å¿
é¡»æ¯å¯ä¸çãè¿æ ·å°±å¯ä»¥éè¿ä¸»ä½(principal) æ¥åºå两个ç¸åçç»å½æ¨¡åãï¼ä¾å¦ï¼ä»ä¸¤ä¸ªLDAPç»å½æ¨¡åæå两个ä¸åçLDAPæå¡å¨ï¼
+realmwizard.edit.loginDomainExp = è¿ä¸ªç»å½æ¨¡å对åºçç»å½åï¼æ¨¡åå称å¨å®å
¨åçææ模åä¸å¿
é¡»æ¯å¯ä¸çãè¿æ ·å°±å¯ä»¥éè¿ä¸»ä½(principal) æ¥åºå两个ç¸åçç»å½æ¨¡åãï¼ä¾å¦ï¼ä»ä¸¤ä¸ªLDAPç»å½æ¨¡åæå两个ä¸åç LDAP æå¡å¨ï¼
realmwizard.edit.loginModuleClassExp = ç»å½æ¨¡åçå®å
¨éå®ç±»åã
-realmwizard.edit.loginModuleJAR = ç»å½æ¨¡åJAR
-realmwizard.edit.loginModuleJARExp = æ¤jaræ件ä¸å
å«ç»å½æ¨¡åç±»å主ä½ç±».
+realmwizard.edit.loginModuleJAR = ç»å½æ¨¡å JAR
+realmwizard.edit.loginModuleJARExp = æ¤ JAR æ件ä¸å
å«ç»å½æ¨¡åç±»å主ä½ç±».
realmwizard.edit.realmNameExp = åä¸ä¸ªä¸åäºæå¡å¨ä¸ä»»ä½å
¶ä»å®å
¨åçå称ãå称ä¸è¯·ä¸è¦æç©ºæ ¼ãå
¶ä»ç»ä»¶å°ä½¿ç¨è¿ä¸ªå称æ¥æåæ¤å®å
¨åã
-realmwizard.edit.serverSideExp = å¨åºç¨æå¡å¨ä¸æ§è¡Server-sideçç»å½æ¨¡åï¼è¿é常æ¯æ£ç¡®çï¼ãå¨å®¢æ·ç«¯ç¯å¢æ§è¡çæ¯Client-sideçç»å½æ¨¡åï¼ä¸¾ä¾æ¥è¯´ï¼ä¸ºäºä½¿ç¨å®¢æ·æä½ç³»ç»ç³»ç»çåç¹ç»å½ç¹æ§ã
+realmwizard.edit.serverSideExp = å¨åºç¨æå¡å¨ä¸æ§è¡Server-sideçç»å½æ¨¡åï¼è¿é常æ¯æ£ç¡®çï¼ãå¨å®¢æ·ç«¯ç¯å¢æ§è¡çæ¯ Client-side çç»å½æ¨¡åï¼ä¸¾ä¾æ¥è¯´ï¼ä¸ºäºä½¿ç¨å®¢æ·æä½ç³»ç»ç³»ç»çåç¹ç»å½ç¹æ§ã
realmwizard.edit.summary = <p>è¿ä¸ªé¡µé¢ç¨æ¥ç¼è¾æ°çæå·²åå¨çå®å
¨åã</p><p>ä¸ä¸ªå®å
¨åå¯è½å
å«ä¸ä¸ªæå¤ä¸ªç»å½æ¨¡åãå¾å¤ç®åçå®å
¨åä»
ä»
å
å«ä¸ä¸ªç»å½æ¨¡åãå¯ä»¥ä½¿ç¨é¢å¤çç»å½æ¨¡åæ¥è®¿é®æ´å¤çå®å
¨ç¸å
³ä¿¡æ¯ãæè
æ·»å 类似äºå®¡æ ¸å®å
¨åèä¸å½±åå®å
¨åéªè¯æµç¨çåè½ã
-realmwizard.edit.supportAdvancedMappingExp = é常ï¼Geronimoä¸è½åºå«æåæ ·å称ç两个ä¸åç主ä½ï¼ä»¥å两个ä¸åç»å½æ¨¡å产ççåæ ·ç主ä½ç±»ãå¦æå¯ç¨åè¿ä¸ªé项ï¼Geronimo ä¼å
è£
主ä½å¹¶è·è¸ªæ¯ä¸ªä¸»ä½æ¥èªåªä¸ªå®å
¨ååç»å½æ¨¡åãè¿è®©ä½ å¯ä»¥å¨Geronimo é¨ç½²è®¡åçå®å
¨æ å°ä¸ä½¿ç¨ realm-principal å login-domain-principal å
ç´ ã
+realmwizard.edit.supportAdvancedMappingExp = é常ï¼Geronimo ä¸è½åºå«æåæ ·å称ç两个ä¸åç主ä½ï¼ä»¥å两个ä¸åç»å½æ¨¡å产ççåæ ·ç主ä½ç±»ãå¦æå¯ç¨åè¿ä¸ªé项ï¼Geronimo ä¼å
è£
主ä½å¹¶è·è¸ªæ¯ä¸ªä¸»ä½æ¥èªåªä¸ªå®å
¨ååç»å½æ¨¡åãè¿è®©ä½ å¯ä»¥å¨Geronimo é¨ç½²è®¡åçå®å
¨æ å°ä¸ä½¿ç¨ realm-principal å login-domain-principal å
ç´ ã
realmwizard.list.noSecurityRealms = ä¸åå¨é¢å®ä¹çå®å
¨å
realmwizard.list.seeExamples = 对äºååºçæ¯ä¸ä¸ªåï¼å¯ä»¥ç¹å»<b>ç¨æ³</b>æ¥æ¥çå¦ä½å¨ä½ çåºç¨ä¸ä½¿ç¨è¯¥åçä¾åã
realmwizard.list.title = è¿ä¸ªé¡µé¢æ¾ç¤ºäºææå¯ç¨çå®å
¨åãå¯ä»¥ç¼è¾æå¡å¨çº§å«çå®å
¨åï¼ä½ä¸ºå个åºç¨ä¸é¨å被é¨ç½²çå®å
¨ååä¸è½è¢«ç¼è¾ï¼èåºä¿®æ¹åºç¨é¨ç½²è®¡åï¼ã
realmwizard.selectType.nameOfSecurityRealmExp = ç»å®å
¨åéåä¸ä¸ªä¸åäºæå¡å¨ä¸å
¶å®å®å
¨åçå称ï¼å称ä¸è¯·ä¸è¦æç©ºæ ¼ãå
¶å®ç»ä»¶å°ä½¿ç¨è¿ä¸ªå称æ¥æå该å®å
¨åã
-realmwizard.selectType.realmTypeExp = ç»å½æ¨¡åçç±»åå³å®äºå®å
¨åç±»åãéæ©"Other"ï¼å¯ä»¥æå¨é
ç½®ä¸äºé项ï¼å
æ¬ï¼èªå®ä¹ç»å½æ¨¡åã使ç¨å¤ä¸ªç»å½æ¨¡åæ¥å¡«å
ç¨æ·èº«ä¸»ä½çå®å
¨åã
-realmwizard.selectType.title = <b>å建å®å
¨å</b> --æ¥éª¤1: éæ©å称åç±»å
+realmwizard.selectType.realmTypeExp = ç»å½æ¨¡åçç±»åå³å®äºå®å
¨åç±»åãéæ© âå
¶ä»"å¯ä»¥æå¨é
ç½®ä¸äºé项ï¼å¦èªå®ä¹ç»å½æ¨¡åã使ç¨å¤ä¸ªç»å½æ¨¡åæ¥å¡«å
ç¨æ·èº«ä¸»ä½çå®å
¨åã
+realmwizard.selectType.title = <b>å建å®å
¨å</b> --æ¥éª¤ 1: éæ©å称åç±»å
realmwizard.showPlan.addToEARExp = ä½ å¯ä»¥å°å®å
¨åé¨ç½²ä¸ºEARçä¸é¨åï¼èä¸æ¯é¨ç½²ä¸ºé¡¶å±çå®å
¨åãè¦ä½¿ç¨è¿ä¸ªé¨ç½²è®¡åå°å®å
¨åæ·»å å°EARä¸ï¼å¨ä½ çEARä¸å建<tt>META-INF/geronimo-application.xml</tt>æ件ï¼å
¶ä¸å
å«ä¸é¢é¨ç½²è®¡åä¸ç<tt>dependency</tt>å
ç´ å<tt>gbean</tt>å
ç´ ãå®åºè¯¥è±¡ä¸é¢è¿æ ·ï¼
realmwizard.showPlan.deployCommandExp = å¦æå¨å½ä»¤è¡ä¸ä½¿ç¨è¿ä¸ªé¨ç½²è®¡åæ¥é¨ç½²å®å
¨åï¼å°å®æ·è´ç²å¸å°ä¸ä¸ªæ件ï¼å¦<tt>security-realm.xml</tt>ï¼ä¸å¹¶ä¿åãç¶åè¿è¡ä¸é¢çå½ä»¤ï¼
realmwizard.showPlan.title = <b>å建å®å
¨å</b> -- æ¾ç¤ºé¨ç½²è®¡å
realmwizard.testLogin.passwordExp = ç¨æ¥ç»å½å°å®å
¨åçå¯ç ã
realmwizard.testLogin.summary = å¨è¿éä½ å¯ä»¥ä¸ºå®å
¨åç主ç»å½æ¨¡åè¾å
¥ç¨æ·ååå¯ç ï¼æ£æ¥ç»å½æ¯å¦æåï¼æ¥ç为ç¨æ·çæäºåªäºä¸»ä½ãè¿å¯ä»¥æ示主ç»å½æ¨¡åç设置æ¯å¦æ£ç¡®ãå®ä¸ä¼è°ç¨è±¡å®¡æ ¸ï¼éå®å¸å·çé«çº§åè½ã
-realmwizard.testLogin.title = <b>å建å®å
¨å</b> --æ¥éª¤4ï¼æµè¯ç»å½
+realmwizard.testLogin.title = <b>å建å®å
¨å</b> --æ¥éª¤ 4ï¼æµè¯ç»å½
realmwizard.testLogin.usernameExp = ç¨æ¥ç»å½å°å®å
¨åçç¨æ·åã
realmwizard.testResults.testResults = æµè¯ç»æ
-realmwizard.testResults.title = <b>å建å®å
¨å</b> -- æ¥éª¤5: ç»å½ç»æ
+realmwizard.testResults.title = <b>å建å®å
¨å</b> -- æ¥éª¤ 5: ç»å½ç»æ
realmwizard.usage.applicationCode = åºç¨ç¨åºä»£ç
-realmwizard.usage.applicationCodeExp = <p>使ç¨å®å
¨è§è²ï¼å¹¶ä¸éè¦ç¹æ®çåºç¨ç¨åºä»£ç ã</p><p>å¦æåºç¨ç¨åºä¸è°ç¨<tt>HttpServletRequest.getUserPrincipal()</tt>ï¼Geronimoä¼è¿åä¸ä¸ªå®ç°<tt>GeronimoCallerPrincipal</tt>æ¥å£çprincipalç±»çå®ä¾ã--é常æ¯ç¨æ·åï¼å 为<tt>GeronimoUserPrincipal</tt>å®ç°äº<tt>GeronimoCallerPrincipal</tt>æ¥å£ï¼ãå¦æä½ æ£å¨ä½¿ç¨èªå®ä¹çç»å½æ¨¡åï¼èè°ç¨<tt>getUserPrincipal</tt>æ¶å¾å°äºé误çç»æãå°è¯å°ä½ çuser principalç±»å®ç°<tt>GeronimoCallerPrincipal</tt>æ¥å£ã</p> <p>å¦æåºç¨è°ç¨<tt>HttpServletRequest.isUserI
nRole(role)</tt>ï¼Geronimoå°ä¼æ ¹æ®å®å
¨åç»å½æ¨¡ååé
ç»è¯¥ç¨æ·çprincipalæ¯å¦ååºå¨ä¸é¢çè§è²æ å°ä¸æ¥å³å®è¿åtrueè¿æ¯falseã</p>
-realmwizard.usage.geronimoWebXmlLater = <p>è¿ä¸ªä¾å表æï¼{0} å°è¢«ç¨æ¥å¤ç Web åºç¨çææç»å½ã æ¥çå®ä½¿ç¨ä¸»ä½ç±»å主ä½å称çèåæ¥æ <tt>admin</tt> è§è²æ å°å°ç¨æ· <tt>root</tt> ï¼åç» <tt>administrators</tt> ã注æå¦æ{0} 使ç¨èªå®ä¹çç»å½æ¨¡åï¼ä¸»ä½ç±»å¯è½ä¼ææä¸åã ä½æ¯ä¸é¢ååºçæ¯è¢«ææçæ åçGeronimoç»å½æ¨¡å使ç¨çç¨æ·åç»ã</p> <p>ä¹å¯ä»¥é
ç½®åç¬çç»å½æ¨¡åååç¬çç»å½åå称ï¼ç¶åå¨è§è²æ å°ä¸ä½¿ç¨ç»å½åå
§°ï¼è¿æ ·ï¼å¨ç»å½å Fooä¸ç root ç¨æ·ï¼åå¨ç»å½åBar ä¸çroot ç¨æ·æ¯ä¸ä¸æ ·çï¼ï¼ä½è¿ä»
ä»
å¨ä½ æå¤ä¸ªç»å½æ¨¡åæ¥ç»ç¨æ·åé
主ä½æ¶æéè¦ã</p> <p>æåï¼å¦æ<tt>security</tt>åæ¯å¨ EAR ç<tt>application.xml</tt> é¨ç½²æ述符ä¸å£°æçï¼é£ä¹å°±æ²¡æå¿
è¦å¨EAR ä¸çä»»ä½æ¨¡åä¸éå¤å®ã-- å®ä»¬ä¼å
±äº«ç¸åçè§è²æ å°ä¿¡æ¯ã</p>
-realmwizard.usage.geronimoWebXmlPreface = <p>为äºé
ç½®å®å
¨ååæ¯ä¸ªè§è²çæåï¼Webåºç¨éè¦æä¸ä¸ª<tt>geronimo-web.xml</tt>é¨ç½²è®¡åãå®å¯ä»¥æå
å¨WARå
ç<tt>WEB-INF</tt>ç®å½ä¸ï¼æè
å®ä¹å¯ä»¥å¨é¨ç½²å·¥å
·çå½ä»¤è¡ä¸åç¬å°æä¾ã</p><p><tt>geronimo-web.xml</tt>é¨ç½²è®¡ååºè¯¥æä¸ä¸ª<tt>security-realm-name</tt>å
ç´ ï¼ç¨æ¥æ æå¨Webåºç¨ä¸ç¨ä»ä¹å®å
¨åæ¥éªè¯ç»å½ãå®åæ ·æä¸ä¸ª <tt>security</tt>å
ç´ ï¼ç¨æ¥ååºç¨æ·åç»ï¼è¿äºç¨æ·åç»åºè¯¥æ¯ <tt>web.xml</tt>ä¸ç<tt>security-role</tt>æ æç
è§è²çæåã
+realmwizard.usage.applicationCodeExp = <p>使ç¨å®å
¨è§è²ï¼å¹¶ä¸éè¦ç¹æ®çåºç¨ç¨åºä»£ç ã</p><p>å¦æåºç¨ç¨åºä¸è°ç¨<tt>HttpServletRequest.getUserPrincipal()</tt>ï¼Geronimoä¼è¿åä¸ä¸ªå®ç°<tt>GeronimoCallerPrincipal</tt>æ¥å£ç principal ç±»çå®ä¾ã--é常æ¯ç¨æ·åï¼å 为<tt>GeronimoUserPrincipal</tt>å®ç°äº<tt>GeronimoCallerPrincipal</tt>æ¥å£ï¼ãå¦æä½ æ£å¨ä½¿ç¨èªå®ä¹çç»å½æ¨¡åï¼èè°ç¨<tt>getUserPrincipal</tt>æ¶å¾å°äºé误çç»æãå°è¯å°ä½ ç user principal ç±»å®ç°<tt>GeronimoCallerPrincipal</tt>æ¥å£ã</p> <p>å¦æåºç¨è°ç¨<tt>HttpServletRequest.isU
serInRole(role)</tt>ï¼Geronimoå°ä¼æ ¹æ®å®å
¨åç»å½æ¨¡ååé
ç»è¯¥ç¨æ·çprincipalæ¯å¦ååºå¨ä¸é¢çè§è²æ å°ä¸æ¥å³å®è¿å true è¿æ¯ falseã</p>
+realmwizard.usage.geronimoWebXmlLater = <p>è¿ä¸ªä¾å表æï¼{0} å°è¢«ç¨æ¥å¤ç Web åºç¨çææç»å½ã æ¥çå®ä½¿ç¨ä¸»ä½ç±»å主ä½å称çèåæ¥æ <tt>admin</tt> è§è²æ å°å°ç¨æ· <tt>root</tt> ï¼åç» <tt>administrators</tt> ã注æå¦æ{0} 使ç¨èªå®ä¹çç»å½æ¨¡åï¼ä¸»ä½ç±»å¯è½ä¼ææä¸åã ä½æ¯ä¸é¢ååºçæ¯è¢«ææçæ åçGeronimoç»å½æ¨¡å使ç¨çç¨æ·åç»ã</p> <p>ä¹å¯ä»¥é
ç½®åç¬çç»å½æ¨¡åååç¬çç»å½åå称ï¼ç¶åå¨è§è²æ å°ä¸ä½¿ç¨ç»å½åå
§°ï¼è¿æ ·ï¼å¨ç»å½å Foo ä¸ç root ç¨æ·ï¼åå¨ç»å½å Bar ä¸ç root ç¨æ·æ¯ä¸ä¸æ ·çï¼ï¼ä½è¿ä»
ä»
å¨ä½ æå¤ä¸ªç»å½æ¨¡åæ¥ç»ç¨æ·åé
主ä½æ¶æéè¦ã</p> <p>æåï¼å¦æ<tt>security</tt>åæ¯å¨ EAR ç<tt>application.xml</tt> é¨ç½²æ述符ä¸å£°æçï¼é£ä¹å°±æ²¡æå¿
è¦å¨ EAR ä¸çä»»ä½æ¨¡åä¸éå¤å®ã-- å®ä»¬ä¼å
±äº«ç¸åçè§è²æ å°ä¿¡æ¯ã</p>
+realmwizard.usage.geronimoWebXmlPreface = <p>为äºé
ç½®å®å
¨ååæ¯ä¸ªè§è²çæåï¼Web åºç¨éè¦æä¸ä¸ª<tt>geronimo-web.xml</tt>é¨ç½²è®¡åãå®å¯ä»¥æå
å¨ WAR å
ç<tt>WEB-INF</tt>ç®å½ä¸ï¼æè
å®ä¹å¯ä»¥å¨é¨ç½²å·¥å
·çå½ä»¤è¡ä¸åç¬å°æä¾ã</p><p><tt>geronimo-web.xml</tt>é¨ç½²è®¡ååºè¯¥æä¸ä¸ª<tt>security-realm-name</tt>å
ç´ ï¼ç¨æ¥æ æå¨ Web åºç¨ä¸ç¨ä»ä¹å®å
¨åæ¥éªè¯ç»å½ãå®åæ ·æä¸ä¸ª <tt>security</tt>å
ç´ ï¼ç¨æ¥ååºç¨æ·åç»ï¼è¿äºç¨æ·åç»åºè¯¥æ¯ <tt>web.xml</tt>ä¸ç<tt>security-role</tt>æ æ
è§è²çæåã
realmwizard.usage.title = è¿ä¸ªé¡µé¢ä»ç»ææ ·å¨ J2EE åºç¨ä¸ä½¿ç¨å®å
¨å{0} ãè¿éæ¯ä»¥ Web åºç¨ä¸ºä¾ï¼å¯¹äºå
¶ä»ç¨åºæ¨¡åï¼ä¹å¯ä½¿ç¨ç±»ä¼¼çæ¹æ³ã
realmwizard.usage.webXmlShouldHave = <p>å¨ <tt>web.xml</tt> ä¸åºè¯¥å«æ</p><ul> <li>ä¸ä¸ªæå¤ä¸ª <tt>security-constraint</tt> åï¼ç¨æ¥ææåä¿æ¤ç页é¢å URL </li> <li>ä¸ä¸ª<tt>login-config</tt> åï¼ç¨æ¥é
ç½®åºç¨çç»å½ä¿¡æ¯</li> <li>ä¸ä¸ªæå¤ä¸ª<tt>security-role</tt> åï¼ç¨æ¥ååºåºç¨ä¸ä½¿ç¨å°çå®å
¨è§è²</li></ul>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:23:55 2009
@@ -29,10 +29,10 @@
Security\ Realms = Security Realms
-plugin.errorMsg01 = Deployment Failed
-plugin.errorMsg02 = The application was not successfully started
-plugin.errorMsg03 = Security realm with the same name already exists, please specify a new security realm name.
-plugin.errorMsg04 = Unable to identify modules to replace. Please check if it has already been stopped or undeployed.
+plugin.errorMsg01 = The application was not deployed.
+plugin.errorMsg02 = The application was not successfully started.
+plugin.errorMsg03 = The security realm name already exists. Specify another name for the security realm.
+plugin.errorMsg04 = Unable to identify modules to replace. Check if it has already been stopped or undeployed.
plugin.infoMsg01 = The application was successfully deployed.
plugin.infoMsg02 = The application was successfully redeployed.
plugin.infoMsg03 = The application was successfully started.
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties Mon Dec 7 08:23:55 2009
@@ -33,7 +33,7 @@
plugin.errorMsg01 = é¨ç½²å¤±è´¥
plugin.errorMsg02 = æªæåå¯å¨åºç¨
plugin.errorMsg03 = ååå®å
¨åå·²ç»åå¨ï¼è¯·æå®æ°çå®å
¨åå称ã
-plugin.errorMsg04 = \u00d3\u00a6\u00d3\u00c3·\u00fe\u00ce\u00f1\u00c6÷\u00d6\u00d0\u00b2\u00bb\u00b4\u00e6\u00d4\u00da\u00c4ú\u00cbù\u00d2\u00aa\u00c7ó\u00d6\u00d8\u00d0\u00c2\u00b2\u00bf\u00ca\u00f0\u00b5\u00c4\u00c4\u00a3\u00bfé\u00a1\u00a3\u00c7\u00eb\u00bcì\u00b2é\u00ca\u00c7·\u00f1\u00cbü\u00d2\u00d1\u00be\u00ad\u00cd\u00a3\u00d6\u00b9\u00bbò\u00d0\u00b6\u00d4\u00d8\u00a1\u00a3
+plugin.errorMsg04 = æ æ³æ¾å°è¦æ¿æ¢ç模åã请确认该模åæ¯å¦å·²è¢«åæ¢æè
å¸è½½ã
plugin.infoMsg01 = æåé¨ç½²åºç¨
plugin.infoMsg02 = æåéæ°é¨ç½²åºç¨
plugin.infoMsg03 = æåå¯å¨åºç¨
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties Mon Dec 7 08:23:55 2009
@@ -16,24 +16,24 @@
#=====================================================================
classloaderview.help.content = This view can be used to all the classloader involved in server and the classes it loads.
-classloaderview.help.title = This is the help for the Geronimo Administration Classloader VIEW page.
+classloaderview.help.title = Classloader Viewer Help
classloaderview.view.invertTree = Invert Tree
classloaderview.view.searchOnlySelected = Search only selected
classloaderview.view.searchText = Search Text
debugviews.common.find = Find
debugviews.common.findNext = Find Next
-debugviews.common.notFound = Can not find
-debugviews.common.pleaseSelect = Please selecte one node
+debugviews.common.notFound = Cannot find
+debugviews.common.pleaseSelect = Select one node
debugviews.common.noText = No text to search
-dependencyview.help.summary = This view can be used to all the modules and its dependencies.
-dependencyview.help.title = This is the help for the Geronimo Administration Dependency VIEW page.
+dependencyview.help.summary = This view can be used to view all the modules and its dependencies.
+dependencyview.help.title = Dependency Viewer Help
dependencyview.view.searchOnlySelected = Search only selected
dependencyview.view.searchText = Search Text
jmxmanager.help.JMXTree = JMX Tree
-jmxmanager.help.JMXTreeExp1 = <li>You can use this tree to view the different types of MBeans</li> <li>Each MBean will be represented as a tree node that shows its object name representation</li><li>'All MBeans' will give you a list of MBeans grouped by its domain</li> <li>'J2EE MBeans' will give you a list of MBeans grouped by JSR 77 MBean types:</li>
+jmxmanager.help.JMXTreeExp1 = <li>You can view different types of MBeans in the JMX tree.</li> <li>Each MBean will be represented as a tree node that shows its object name representation</li><li>'All MBeans' will give you a list of MBeans grouped by its domain</li> <li>'J2EE MBeans' will give you a list of MBeans grouped by JSR 77 MBean types:</li>
jmxmanager.help.abstractName = Abstract Name
jmxmanager.help.attributes = Attributes
jmxmanager.help.attributesTab = Attributes Tab
@@ -59,7 +59,7 @@
jmxmanager.help.search = Search
jmxmanager.help.searchMBeansExp = 'Search MBeans' will give you a list of MBeans matching a pattern from the 'Search' tab
jmxmanager.help.searchTab = Search Tab
-jmxmanager.help.searchTabExp = <ul> <li>You can use this tab to query MBeans matching a particular pattern</li> <li>Matching MBeans will be added under the 'Search MBeans' tree node. You might need to scroll down the JMX tree to view results.</li> <li>Examples of Object Name Patterns:</li> <ul> <li>"*:*" - will return all the MBeans <li>"geronimo:*" - will return all MBeans with "geronimo" domain <li>"*:j2eeType=GBean,*" - will return all GBeans </ul> </ul>
+jmxmanager.help.searchTabExp = <ul> <li>You can use this tab to query MBeans matching a particular pattern</li> <li>Matching MBeans will be added under the 'Search MBeans' tree node. You might need to scroll down the JMX tree to view results.</li> <li>Examples of Object Name Patterns:</li> <ul> <li>"*:*" - will return all the MBeans <li>"geronimo:*" - will return all MBeans with "Geronimo" domain <li>"*:j2eeType=GBean,*" - will return all GBeans </ul> </ul>
jmxmanager.help.setter = Setter
jmxmanager.help.stats = Stats
jmxmanager.help.statsTab = Stats Tab
@@ -72,7 +72,7 @@
jmxmanager.help.viewStats = View Stats
jndiview.help.content = This view can be used to view JNDI context for various modules.
-jndiview.help.title = This is the help for the Geronimo Administration JNDI VIEW page.
+jndiview.help.title = JNDI Viewer Help
jndiview.view.caseSensitive = Case Sensitive
jndiview.view.searchOnlySelected = Search only selected
jndiview.view.searchText = Search Text
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties Mon Dec 7 08:23:55 2009
@@ -16,7 +16,7 @@
#=====================================================================
classloaderview.help.content = è¿ä¸ªè§å¾å¯ç¨äºæ¥çæå¡å¨å
å«çææç±»å è½½å¨åç±»å è½½å¨å è½½çææç±»ã
-classloaderview.help.title = è¿æ¯Geronimo管çç±»å è½½å¨è§å¾é¡µé¢ç帮å©é¡µé¢ã
+classloaderview.help.title = ç±»å è½½å¨æ¥çå¨å¸®å©é¡µé¢
classloaderview.view.invertTree = å转æ
classloaderview.view.searchOnlySelected = ä»
æ¥æ¾éä¸é¡¹
classloaderview.view.searchText = æ¥æ¾å
容
@@ -28,23 +28,23 @@
debugviews.common.noText = 请æå®å
³é®è¯
dependencyview.help.summary = è¿ä¸ªè§å¾å¯ä»¥ç¨äºæ¥çææ模ååå®ä»¬çä¾èµé¡¹ã
-dependencyview.help.title = è¿æ¯ä¸ä¸ªå¸®å©é¡µé¢ï¼æå¯¼ä½ å¦ä½ä½¿ç¨Geronimoæ§å¶å°çä¾èµè§å¾ã
+dependencyview.help.title = ä¾èµé¡¹æ¥çå¨å¸®å©é¡µé¢ã
dependencyview.view.searchOnlySelected = ä»
æ¥æ¾æéæ©èç¹
dependencyview.view.searchText = æç´¢æå
jmxmanager.help.JMXTree = JMXæ
-jmxmanager.help.JMXTreeExp1 = <li>å¯ä»¥éè¿æ¬é¡µé¢æ¥æ¥çä¸åç±»åçMBeans</li> <li>æ¯ä¸ä¸ªMBeanç±æ ä¸çä¸ä¸ªæ¾ç¤ºå¯¹è±¡å称çèç¹è¡¨ç¤º</li><li>'All MBeans' ååºäºæ ¹æ®åæ¥åç»çMBean</li> <li>'J2EE MBeans' ååºäºæ ¹æ®JSR 77ä¸çMBeanç±»åæ¥åç»çMBeans:</li>
+jmxmanager.help.JMXTreeExp1 = <li>å¯ä»¥éè¿æ¬é¡µé¢æ¥æ¥çä¸åç±»åç MBeans</li> <li>æ¯ä¸ä¸ª MBean ç±æ ä¸çä¸ä¸ªæ¾ç¤ºå¯¹è±¡å称çèç¹è¡¨ç¤º</li><li>'All MBeans' ååºäºæ ¹æ®åæ¥åç»ç MBean</li> <li>'J2EE MBeans' ååºäºæ ¹æ® JSR-77 ä¸ç MBean ç±»åæ¥åç»ç MBeansï¼</li>
jmxmanager.help.abstractName = æ½è±¡å称
jmxmanager.help.attributes = å±æ§
jmxmanager.help.attributesTab = å±æ§é项å¡
-jmxmanager.help.attributesTabExp = <ul><li>ååºMBeanå±æ§</li> <li>å¯ä»¥ç¹å»åç头é¨ä»¥æåº</li><li>å¯ä»¥ç¹å»è¡¨çæ¯ä¸è¡ä»¥åè®°å·,æ¹ä¾¿æ¥ç</li><li>å¯ä»¥ç¹å»Setteræé®ä»¥è®¾ç½®å±æ§å¼å¹¶æ¾ç¤ºç»æ.</li> <li><b>注æ:</b>请å°å¿è®¾ç½®MBeançå±æ§å¼å 为å®å°å½±åå°æå¡å¨çè¿è¡.</li></ul>
+jmxmanager.help.attributesTabExp = <ul><li>ååº MBean å±æ§</li> <li>å¯ä»¥ç¹å»åç头é¨ä»¥æåº</li><li>å¯ä»¥ç¹å»è¡¨çæ¯ä¸è¡ä»¥åè®°å·ï¼æ¹ä¾¿æ¥ç</li><li>å¯ä»¥ç¹å»Setteræé®ä»¥è®¾ç½®å±æ§å¼å¹¶æ¾ç¤ºç»æã</li> <li><b>注æï¼</b>请å°å¿è®¾ç½® MBean çå±æ§å¼å 为å®å°å½±åå°æå¡å¨çè¿è¡ã</li></ul>
jmxmanager.help.className = ç±»å
jmxmanager.help.domain = å
-jmxmanager.help.geronimoMBeansExp = 'Geronimo MBeans'å°æç
§Geronimoç¹å®çMBeanç±»ååç»ååºMBean
+jmxmanager.help.geronimoMBeansExp = 'Geronimo MBeans' å°æç
§ Geronimo ç¹å®ç MBean ç±»ååç»ååº MBean
jmxmanager.help.getter = Getter
jmxmanager.help.info = ä¿¡æ¯
jmxmanager.help.infoTab = ä¿¡æ¯é项å¡
-jmxmanager.help.infoTabExp = ååºMBeançåºæ¬ä¿¡æ¯
+jmxmanager.help.infoTabExp = ååº MBean çåºæ¬ä¿¡æ¯
jmxmanager.help.j2eeType = J2EEç±»å
jmxmanager.help.manageable = å¯ç®¡çç
jmxmanager.help.name = å称
@@ -52,14 +52,14 @@
jmxmanager.help.objectNamePattern = 对象 å称 模å¼
jmxmanager.help.operations = æä½
jmxmanager.help.operationsTab = æä½é项å¡
-jmxmanager.help.operationsTabExp = <ul> <li>ååºMBeanæä½</li><li>ä½ å¯ä»¥æä¾ä¸åçåæ°å¼ç¶åç¹å»æä½æé®ä»¥æ§è¡MBeanæä½å¹¶æ¥çç»æ.</li> <li><b>Note:</b> å°å¿è°ç¨MBeançæä½å 为å®å¯è½ä¼å½±åå°æå¡å¨çè¿è¡.</li></ul>
+jmxmanager.help.operationsTabExp = <ul> <li>ååº MBean æä½</li><li>ä½ å¯ä»¥æä¾ä¸åçåæ°å¼ç¶åç¹å»æä½æé®ä»¥æ§è¡ MBean æä½å¹¶æ¥çç»æã</li> <li><b>注æï¼</b> å°å¿è°ç¨ MBean çæä½å 为å®å¯è½ä¼å½±åå°æå¡å¨çè¿è¡ã</li></ul>
jmxmanager.help.paramList = åæ°å表
jmxmanager.help.persistent = æä¹
ç
jmxmanager.help.refreshStats = å·æ°ç»è®¡
jmxmanager.help.search = æç´¢
-jmxmanager.help.searchMBeansExp = 'æç´¢MBean'å°ååºå¹é
'Search'é项å¡ä¸ç模å¼çMBean
+jmxmanager.help.searchMBeansExp = 'æç´¢ MBean'å°ååºå¹é
'Search' é项å¡ä¸ç模å¼ç MBean
jmxmanager.help.searchTab = æç´¢é项å¡
-jmxmanager.help.searchTabExp = <ul> <li>ä½ å¯ä»¥ä½¿ç¨è¿ä¸ªé项å¡æ¥æ¥è¯¢æ»¡è¶³ç¹å®æ¨¡å¼ççMBean</li> <li>满足çMBeanå°è¢«æ·»å å°'æç´¢MBeans'çæ èç¹ä¸. ä½ å¯è½éè¦åä¸æ»å¨JMXæ 以æ¥çç»æ.</li> <li>对象å称模å¼çä¾å:</li> <ul> <li>"*:*" - å°è¿åææçMBean <li>"geronimo:*" - å°è¿å"geronimo"åä¸çææMBean <li>"*:j2eeType=GBean,*" - å°è¿åææçGBean </ul> </ul>
+jmxmanager.help.searchTabExp = <ul> <li>ä½ å¯ä»¥ä½¿ç¨è¿ä¸ªé项å¡æ¥æ¥è¯¢æ»¡è¶³ç¹å®æ¨¡å¼çç MBean</li> <li>满足çMBeanå°è¢«æ·»å å°'æç´¢MBeans'çæ èç¹ä¸. ä½ å¯è½éè¦åä¸æ»å¨JMXæ 以æ¥çç»æ.</li> <li>对象å称模å¼çä¾å:</li> <ul> <li>"*:*" - å°è¿åææçMBean <li>"geronimo:*" - å°è¿å"geronimo"åä¸çææMBean <li>"*:j2eeType=GBean,*" - å°è¿åææçGBean </ul> </ul>
jmxmanager.help.setter = Setter
jmxmanager.help.stats = ç»è®¡
jmxmanager.help.statsTab = ç»è®¡é项å¡
@@ -69,18 +69,18 @@
jmxmanager.help.viewAttributes = æ¥çå±æ§
jmxmanager.help.viewInfo = æ¥çä¿¡æ¯
jmxmanager.help.viewOperations = æ¥çæä½
-jmxmanager.help.viewStats = èçç»è®¡
+jmxmanager.help.viewStats = æ¥çç»è®¡
-jndiview.help.content = è¿ä¸ªé¡µé¢ç¨äºæ¥çåç§æ¨¡åçJNDIç¯å¢ã
-jndiview.help.title = è¿æ¯Geronimo管çæ§å¶å°æ¥çJNDI页é¢ç帮å©é¡µé¢ã
+jndiview.help.content = è¿ä¸ªé¡µé¢ç¨äºæ¥çåç§æ¨¡åç JNDI ç¯å¢ã
+jndiview.help.title = JNDI æ¥çå¨å¸®å©é¡µé¢
jndiview.view.caseSensitive = åºå大å°å
jndiview.view.searchOnlySelected = åªæ索已éå®ç
jndiview.view.searchText = æ¥æ¾æå
-keystore.jmxmanager.title = JMXæ¥çå¨Portlet帮å©
+keystore.jmxmanager.title = JMX æ¥çå¨å¸®å©é¡µé¢
-ldapmanager.help.canDoTheFollowing = <p>LDAPæ¥çå¨portletå¯ç¨æ¥åæ§è¡å¦ä¸ä»»å¡:<ul> <li>è¿æ¥å°ä»»ä½LDAPæå¡å¨å¹¶æµè§å
¶å
容(é»è®¤æ¯å
ç½®çLDAPæå¡å¨ - Apache DS) <li>æ¥çæ¡ç®çå±æ§ <li>å¨æå®æ¡ç®ä¸æ§è¡LDAPæç´¢ <li>å·æ°ä»»ä½æ¡ç®ä»¥ä»ç®å½æå¡å¨åå¾ææ°æ°æ® <li>æ¥çLDAPè¿æ¥çç¯å¢æ°æ® </ul>
-ldapmanager.help.note = 注æ:å³å»ä»»ä½æ èç¹å¯æ¥çä¸ä¸æèå以æ§è¡æä½
+ldapmanager.help.canDoTheFollowing = <p>LDAPè§å¾é¡µé¢å¯ç¨æ¥åæ§è¡å¦ä¸ä»»å¡ï¼<ul> <li>è¿æ¥å°ä»»æ LDAP æå¡å¨å¹¶æµè§å
¶å
容(é»è®¤æ¯å
ç½®ç LDAP æå¡å¨ - Apache DS) <li>æ¥çæ¡ç®çå±æ§ <li>å¨æå®æ¡ç®ä¸æ§è¡ LDAP æç´¢ <li>å·æ°ä»»ä½æ¡ç®ä»¥ä»ç®å½æå¡å¨åå¾ææ°æ°æ® <li>æ¥ç LDAP è¿æ¥çç¯å¢æ°æ® </ul>
+ldapmanager.help.note = 注æï¼å³å»ä»»ä½æ èç¹å¯æ¥çä¸ä¸æèå以æ§è¡æä½
ldapmanager.viewLDAPServer.DN = DN
ldapmanager.viewLDAPServer.SSL = SSL
ldapmanager.viewLDAPServer.anonymousBind = å¿åç»å®
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties Mon Dec 7 08:23:55 2009
@@ -31,30 +31,30 @@
monitor.common.nav = Navigation
monitor.common.none = none
monitor.common.other = Other
-monitor.common.ret = To return to the main Monitoring panel select the "view" link from the header of this portlet.
+monitor.common.ret = To return to the main Monitoring panel, select the "view" link in the upper-right corner of this portlet.
monitor.common.save = Save
monitor.common.server = Servers
monitor.common.st = something
monitor.common.unknown = Unknown
monitor.common.view = Views
monitor.common.restore = Reset
-monitor.edit.desc = This is the edit page for the Monitoring Portlet
-monitor.edit.msg01 = Click on 'Monitoring → Add Server'. Choose
-monitor.edit.msg02 = The Server 'localhost' will appear 'online' i.e. the monitoring console can talk to it.
-monitor.edit.msg03 = Enable data collection by clicking on 'Enable Query'.
-monitor.edit.msg04 = Click on 'localhost' to view live statistics for chosen MBeans. By default 4/5 Mbeans are chosen for statistics collection. Use '<b>x</b>' to remove MBeans from 'Statistics Collected'. Use '<b>+</b>' in 'Statistics Available' to add an MBean to 'Statistics Collected' MBeans.
+monitor.edit.desc = This is the edit page for the <b>Monitoring</b> Portlet
+monitor.edit.msg01 = Click 'Monitoring→ Add Server'. Choose
+monitor.edit.msg02 = The Server 'localhost' will appear 'online', which means the monitoring console can talk to it.
+monitor.edit.msg03 = Click 'Enable Query' to enable data collection.
+monitor.edit.msg04 = Click 'localhost' to view live statistics for chosen MBeans. By default 4/5 Mbeans are chosen for statistics collection. Use '<b>x</b>' to remove MBeans from 'Statistics Collected'. Use '<b>+</b>' in 'Statistics Available' to add an MBean to 'Statistics Collected' MBeans.
monitor.edit.msg05 = To plot a graph for a statistics click on a link in 'Live Statistics'.
monitor.edit.msg06 = As an example choose 'JMV Heap Size Current'. Choose the following values
-monitor.edit.msg07 = must be a unique name
+monitor.edit.msg07 = A unique name for the graph
monitor.edit.msg08 = The label for the graph
-monitor.edit.msg09 = Y axis for the graph, e.g. JVM Heap - MB
-monitor.edit.msg10 = Save the graph using 'save'
-monitor.edit.msg11 = To plot a graph for bytes sent each interval click on 'BytesSent' for TomcatWebConnector. Use the following values
-monitor.edit.msg12 = Y axis for the graph, e.g. Bytes Sent/sec
-monitor.edit.msg13 = i.e. the bytes sent during 5 minutes (300 sec)
-monitor.edit.msg14 = Hint : Try 'Request Count' and 'Open Connections' for JettyWebConnector
-monitor.edit.msg15 = Create a view using 'Add view'. Select all the graphs and save the view.
-monitor.edit.msg16 = To see the graphs use 'Show this view'
+monitor.edit.msg09 = Y axis for the graph, for example, JVM Heap - MB
+monitor.edit.msg10 = Click 'Save' to save the graph
+monitor.edit.msg11 = To plot a graph for bytes sent each interval click 'BytesSent' for TomcatWebConnector. Use the following values
+monitor.edit.msg12 = Y axis for the graph, for example, Bytes Sent/sec
+monitor.edit.msg13 = For example, the bytes sent during 5 minutes (300 sec)
+monitor.edit.msg14 = Notes: Try 'Request Count' and 'Open Connections' for JettyWebConnector
+monitor.edit.msg15 = Click 'Create a view' to add a new view. Select all the graphs and save the view.
+monitor.edit.msg16 = Click the name of the view to see the graphs.
monitor.edit.stuff = Edit stuff...
monitor.graph.addGraph = Add a new graph
monitor.graph.asis = As-is
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties Mon Dec 7 08:23:55 2009
@@ -31,49 +31,49 @@
monitor.common.nav = 导èª
monitor.common.none = æ
monitor.common.other = å
¶å®
-monitor.common.ret = ç¹å»portlet头é¨çâè§å¾âé¾æ¥è¿åçæ§ä¸»é¡µé¢
+monitor.common.ret = ç¹å» portlet å³ä¸è§çâè§å¾âé¾æ¥è¿åçæ§ä¸»é¡µé¢
monitor.common.save = ä¿å
monitor.common.server = æå¡å¨
monitor.common.st = ä»ä¹
monitor.common.unknown = æªç¥
monitor.common.view = è§å¾
monitor.common.restore = éç½®
-monitor.edit.desc = è¿æ¯çæ§å¨portletçç¼è¾é¡µé¢
+monitor.edit.desc = è¿æ¯çæ§å¨ portlet çç¼è¾é¡µé¢
monitor.edit.msg01 = ç¹å» 'çæ§å¨ → æ·»å æå¡å¨'. éæ©
-monitor.edit.msg02 = æå¡å¨ 'localhost'å°æ¾ç¤ºä¸º 'å¨çº¿'',亦å³çæ§å¨æ§å¶å°å¯ä»¥ä¸å®äº¤äº
+monitor.edit.msg02 = æå¡å¨ 'localhost'å°æ¾ç¤ºä¸º 'å¨çº¿'',å³è¡¨ç¤ºçæ§å¨æ§å¶å°å¯ä»¥ä¸å®äº¤äº
monitor.edit.msg03 = ç¹å»'å¯ç¨æ¥è¯¢'以å¯ç¨æ°æ®æ¶é
-monitor.edit.msg04 = ç¹å»'localhost'以æ¥çéå®MBeançå®æ¶ç»è®¡. é»è®¤æ4/5çMBean被æ¶éç¨äºç»è®¡.ä½¿ç¨ '<b>x</b>'ä»'å·²æ¶éç»è®¡'ä¸ç§»é¤MBean.使ç¨'å¯ç¨ç»è®¡'ä¸ç '<b>+</b>'以添å ä¸ä¸ªMBeanå°'å·²æ¶éç»è®¡'çMBeanä¸
+monitor.edit.msg04 = ç¹å»'localhost' 以æ¥çéå® MBean çå®æ¶ç»è®¡ä¿¡æ¯. é»è®¤æ 4/5 ç MBean 被æ¶éç¨äºç»è®¡.ä½¿ç¨ '<b>x</b>'ä»'å·²æ¶éç»è®¡'ä¸ç§»é¤MBean.使ç¨'å¯ç¨ç»è®¡'ä¸ç '<b>+</b>'以添å ä¸ä¸ª MBean å°'å·²æ¶éç»è®¡'ç MBean ä¸
monitor.edit.msg05 = ç¹å»'å®æ¶ç»è®¡'ä¸çé¾æ¥ä»¥ç»å¶ç»è®¡å¾
-monitor.edit.msg06 = 举ä¾è¯´æï¼éæ© 'å½åJMVå 大å°'.éæ©ä¸åå¼
+monitor.edit.msg06 = 举ä¾è¯´æï¼éæ© 'å½å JMV å 大å°'.éæ©ä¸åå¼
monitor.edit.msg07 = å称å¿
é¡»å¯ä¸
monitor.edit.msg08 = å¾å½¢çæ ç¾
-monitor.edit.msg09 = å¾å½¢çYè½´,ä¾å¦.JVM å - MB
+monitor.edit.msg09 = å¾å½¢ç Y è½´,ä¾å¦ JVM å - MB
monitor.edit.msg10 = ç¹å»'ä¿å'以ä¿åå¾å½¢
-monitor.edit.msg11 = ç¹å»TomcatWebConnectorç 'å·²ä¼ éåèæ°'以ç»å¶æ¯ä¸ªæ¶é´é´éä¼ éåèæ°çå¾å½¢.使ç¨å¦ä¸å¼
+monitor.edit.msg11 = ç¹å» TomcatWebConnector ç 'å·²ä¼ éåèæ°'以ç»å¶æ¯ä¸ªæ¶é´é´éä¼ éåèæ°çå¾å½¢ã使ç¨å¦ä¸å¼
monitor.edit.msg12 = å¾å½¢çYè½´,lä¾å¦.ä¼ éåèæ°/ç§
-monitor.edit.msg13 = 亦å³.5åéå
ä¼ éçåèæ°(300ç§)
-monitor.edit.msg14 = æ示:请å°è¯JettyWebConnectorå¦ææ³çæ§ 'Request Count' ä¸ 'Open Connections'
-monitor.edit.msg15 = 使ç¨'æ·»å è§å¾'以æ°å»ºè§å¾.éæ©ææå¾å½¢å¹¶ä¿å该è§å¾
-monitor.edit.msg16 = 使ç¨'æ¾ç¤ºè§å¾'以æ¥çå¾å½¢
+monitor.edit.msg13 = 亦å³.5åéå
ä¼ éçåèæ°( 300 ç§)
+monitor.edit.msg14 = 注æï¼å¦ææ³çæ§ JettyWebConnectorï¼è¯·éæ© '请æ±æ° ä¸ 'å¼æ¾è¿æ¥æ°'ä¿¡æ¯
+monitor.edit.msg15 = åå»'å建æ°è§å¾'以添å ä¸ä¸ªè§å¾ãéæ©ææå¾å½¢å¹¶ä¿å该è§å¾
+monitor.edit.msg16 = åå»è§å¾å称以æ¥çå
¶å¾å½¢è¡¨ç¤º
monitor.edit.stuff = ç¼è¾...
monitor.graph.addGraph = æ·»å æ°å¾å½¢
-monitor.graph.asis = As-is
+monitor.graph.asis = ä¿çå½åå¼
monitor.graph.change = æ¹å (å¢é)
monitor.graph.createGraph = å建å¾å½¢
monitor.graph.data = æ°æ®åºå
monitor.graph.deleteGraph = å é¤å¾å½¢
monitor.graph.math = æ°å¦è¿ç®
monitor.graph.notExist = å¾å½¢ä¸åå¨
-monitor.graph.selectMbeanFirst = 请å
éæ©MBean
-monitor.graph.selectOpFirst = 请å
éæ©è¿ç®
+monitor.graph.selectMbeanFirst = 请å
éæ© MBean
+monitor.graph.selectOpFirst = 请å
éæ©ç®æ³
monitor.graph.selectServer = éæ©æå¡å¨
monitor.graph.selectServerFirst = 请å
éæ©æå¡å¨
monitor.graph.server = æå¡å¨
monitor.graph.showArchive = æ¥çåæ¡£
monitor.graph.time = æ¶é´å¸§
-monitor.graph.x = Xè½´æ ç¾
-monitor.graph.y = Yè½´æ ç¾
-monitor.help.desc = çæ§å¨æ§å¶å°è¢«è®¾è®¡ç¨æ¥çæ§å¨åç¬çJVMä¸è¿è¡çgeronimoå®ä¾.ä½ä¸ºä¸ä¸ªå¿«éæ¼ç¤º,æ们å°æ¥çæ£å¨è¿è¡çæ§å¨æ§å¶å°çGeronimoçå®ä¾.
+monitor.graph.x = X è½´æ ç¾
+monitor.graph.y = Y è½´æ ç¾
+monitor.help.desc = çæ§å¨æ§å¶å°è¢«è®¾è®¡ç¨æ¥çæ§å¨åç¬ç JVM ä¸è¿è¡ç Geronimo å®ä¾.ä½ä¸ºä¸ä¸ªå¿«éæ¼ç¤º,æ们å°æ¥çæ£å¨è¿è¡çæ§å¨æ§å¶å°ç Geronimo çå®ä¾.
monitor.help.title = 欢è¿æ¥å°çæ§å¨æ§å¶å°
monitor.server.addServer = æ·»å æå¡å¨
monitor.server.deleteServer = å é¤æå¡å¨
@@ -103,7 +103,7 @@
monitor.server.snapshotThread = å¿«ç
§çº¿ç¨
monitor.server.statAvailable = å¯ç¨ç»è®¡
monitor.server.statCollected = å·²æ¶éç»è®¡
-monitor.server.statNA = ç»è®¡beanå½åä¸å¯ç¨
+monitor.server.statNA = ç»è®¡ Bean å½åä¸å¯ç¨
monitor.server.statQuery = ç»è®¡æ¥è¯¢
monitor.server.status = ç¶æ
monitor.server.stopped = å·²ç»æ¢
@@ -120,5 +120,5 @@
monitor.view.modified = 已修æ¹
monitor.view.modify = ä¿®æ¹è§å¾
monitor.view.notExist = è§å¾ä¸åå¨
-monitor.view.notExistOrDisabled = è§å¾ä¸åå¨æå·²ç¦ç¨
+monitor.view.notExistOrDisabled = è§å¾ä¸åå¨æ被ç¦ç¨
monitor.view.show = æ¾ç¤ºè§å¾
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:23:55 2009
@@ -27,17 +27,17 @@
mconsole.errorMsg08 = Server id <b>{0}</b> not found in database.
mconsole.errorMsg09 = Snapshot thread could <b>NOT</b> be stopped on server <b>{0}</b>.
mconsole.errorMsg10 = Snapshot thread could <b>NOT</b> be started on server <b>{0}</b>.
-mconsole.errorMsg11 = Error encountered while updating view <b>{0}</b>.
-mconsole.errorMsg12 = Error encountered while adding view <b>{0}</b>.
-mconsole.errorMsg13 = Error encountered while updating server.
-mconsole.errorMsg14 = Error encountered while adding server.
-mconsole.errorMsg15 = Error encountered while deleting server.
-mconsole.errorMsg16 = Error encountered while deleting view.
-mconsole.errorMsg17 = Error encountered while adding graph.
-mconsole.errorMsg18 = Error encountered while updating graph.
-mconsole.errorMsg19 = Error encountered while deleting graph.
-mconsole.errorMsg20 = Please delete all the graphs belongs to the server before deleting it.
-mconsole.errorMsg21 = Error encountered while reseting data.
+mconsole.errorMsg11 = An error encountered while updating view <b>{0}</b>.
+mconsole.errorMsg12 = An error encountered while adding view <b>{0}</b>.
+mconsole.errorMsg13 = An error encountered while updating server.
+mconsole.errorMsg14 = An error encountered while adding server.
+mconsole.errorMsg15 = An error encountered while deleting server.
+mconsole.errorMsg16 = An error encountered while deleting view.
+mconsole.errorMsg17 = An error encountered while adding graph.
+mconsole.errorMsg18 = An error encountered while updating graph.
+mconsole.errorMsg19 = An error encountered while deleting graph.
+mconsole.errorMsg20 = Delete all the graphs belongs to the server before deleting it.
+mconsole.errorMsg21 = An error encountered while reseting data.
mconsole.infoMsg01 = Connection was successfully established.
mconsole.infoMsg02 = Server <b>{0}</b> was successfully enabled.
mconsole.infoMsg03 = Server <b>{0}</b> was successfully disabled.
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties Mon Dec 7 08:23:55 2009
@@ -18,12 +18,12 @@
Monitoring = çæ§å¨
mconsole.errorMsg01 = å°æå¡å¨çè¿æ¥å建失败ã
-mconsole.errorMsg02 = server_id为<b>{0}</b>çæå¡å¨æ æ³å¯ç¨ã
-mconsole.errorMsg03 = server_id为<b>{0}</b>çæå¡å¨æ æ³ç¦ç¨ã
+mconsole.errorMsg02 = server_id 为<b>{0}</b>çæå¡å¨æ æ³å¯ç¨ã
+mconsole.errorMsg03 = server_id 为<b>{0}</b>çæå¡å¨æ æ³ç¦ç¨ã
mconsole.errorMsg04 = æ°æ®åºåçé误ã
mconsole.errorMsg05 = æ æ³è¿æ¥å°æå¡å¨<b>{0}</b>ã
-mconsole.errorMsg06 = æ æ³è·è¸ªæå¡å¨<b>{1}</b>ä¸çMBean<b>{0}</b>ã
-mconsole.errorMsg07 = æ æ³åæ¢è·è¸ªæå¡å¨<b>{1}</b>ä¸çMBean<b>{0}</b>ã
+mconsole.errorMsg06 = æ æ³è·è¸ªæå¡å¨<b>{1}</b>ä¸ç MBean<b>{0}</b>ã
+mconsole.errorMsg07 = æ æ³åæ¢è·è¸ªæå¡å¨<b>{1}</b>ä¸ç MBean<b>{0}</b>ã
mconsole.errorMsg08 = æ°æ®åºä¸ä¸åå¨id为<b>{0}</b>çæå¡å¨ã
mconsole.errorMsg09 = æ æ³åæ¢æå¡å¨<b>{0}</b>ä¸çå¿«ç
§çº¿ç¨ã
mconsole.errorMsg10 = æ æ³å¼å¯æå¡å¨<b>{0}</b>ä¸çå¿«ç
§çº¿ç¨ã
@@ -36,13 +36,13 @@
mconsole.errorMsg17 = æ·»å å¾å½¢æ¶éå°é误ã
mconsole.errorMsg18 = æ´æ°å¾å½¢æ¶éå°é误ã
mconsole.errorMsg19 = å é¤å¾å½¢æ¶éå°é误ã
-mconsole.errorMsg20 = 请å
å é¤ææå±äºè¿ä¸ªServerçGraphï¼åå é¤è¿ä¸ªServerã
+mconsole.errorMsg20 = 请å
å é¤ææå±äºè¿ä¸ªæå¡å¨çå¾å½¢ï¼åå é¤è¿ä¸ªæå¡å¨ã
mconsole.errorMsg21 = éç½®æ°æ®æ¶éå°é误
mconsole.infoMsg01 = æå建ç«è¿æ¥ã
mconsole.infoMsg02 = æåå¯ç¨æå¡å¨<b>{0}</b>ã
mconsole.infoMsg03 = æåç¦ç¨æå¡å¨<b>{0}</b>ã
-mconsole.infoMsg04 = å¼å§è·è¸ªæå¡å¨<b>{1}</b>ä¸çMBean<b>{0}</b>ã
-mconsole.infoMsg05 = åæ¢è·è¸ªæå¡å¨<b>{1}</b>ä¸çMBean<b>{0}</b>ã
+mconsole.infoMsg04 = å¼å§è·è¸ªæå¡å¨<b>{1}</b>ä¸ç MBean<b>{0}</b>ã
+mconsole.infoMsg05 = åæ¢è·è¸ªæå¡å¨<b>{1}</b>ä¸ç MBean<b>{0}</b>ã
mconsole.infoMsg06 = å·²åæ¢æå¡å¨<b>{0}</b>ä¸çå¿«ç
§çº¿ç¨ã
mconsole.infoMsg07 = å·²å¼å¯æå¡å¨<b>{0}</b>ä¸çå¿«ç
§çº¿ç¨ã
mconsole.infoMsg08 = å·²æ´æ°è§å¾<b>{0}</b>ã
Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties Mon Dec 7 08:23:55 2009
@@ -16,23 +16,23 @@
#=====================================================================
portlet.openejb.help.activation = ActivationSpecClass
-portlet.openejb.help.activationdesc = Specifies the activation spec class Default value is org.apache.activemq.ra.ActiveMQActivationSpec
+portlet.openejb.help.activationdesc = Specifies the activation spec class. Default value is org.apache.activemq.ra.ActiveMQActivationSpec
portlet.openejb.help.beanclassname = Bean Class Name
portlet.openejb.help.beanclassnamedesc = This is the name of the Bean Class.
portlet.openejb.help.bmpcontainer = BMP Container
portlet.openejb.help.bmppoolsize = PoolSize
-portlet.openejb.help.bmppoolsizedesc = Specifies the size of the bean pools for this bmp entity container.Default value is 10.
+portlet.openejb.help.bmppoolsizedesc = Specifies the size of the bean pools for this bmp entity container. Default value is 10.
portlet.openejb.help.bulkpassivate = BulkPassivate
-portlet.openejb.help.bulkpassivatedesc = Property name that specifies the number of instances to passivate at one time when doing bulk passivation.Default value is 100.
+portlet.openejb.help.bulkpassivatedesc = Property name that specifies the number of instances to passivate at one time when doing bulk passivation. Default value is 100.
portlet.openejb.help.businesslocal = Business Local Interfaces
-portlet.openejb.help.businesslocaldesc = Comma separated list of business local interfaces that the bean has.
+portlet.openejb.help.businesslocaldesc = Comma-separated list of business local interfaces that the bean has.
portlet.openejb.help.businessremote = Business Remote Interfaces
-portlet.openejb.help.businessremotedesc = Comma separated list of business remote interfaces that the bean has.
+portlet.openejb.help.businessremotedesc = Comma-separated list of business remote interfaces that the bean has.
portlet.openejb.help.cef = CmpEngineFactory
portlet.openejb.help.cefdesc = Default value is org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory.
portlet.openejb.help.cmpcontainer = CMP Container
portlet.openejb.help.containerinfo = Container Information
-portlet.openejb.help.containerinfodesc = This portlet also gives us information regarding the different types of OpenEJB containers that are running in Geronimo. We can get this information by clicking on the different containers shown in the tree. The editable fields for each container are shown below
+portlet.openejb.help.containerinfodesc = This portlet also gives us information regarding the different types of OpenEJB containers that are running in Geronimo. To get this information, click the different containers shown in the tree. The editable fields for each container are shown below
portlet.openejb.help.deploymentId = Deployment Id
portlet.openejb.help.deploymentIddesc = Deployment Id of the EJB.
portlet.openejb.help.ejbInfo = EJB Information.
@@ -42,9 +42,9 @@
portlet.openejb.help.ejbname = Ejb Name
portlet.openejb.help.ejbnamedesc = Name of the EJB.
portlet.openejb.help.instancelimit = InstanceLimit
-portlet.openejb.help.instancelimitdesc = Specifies the maximum number of bean instances that are allowed to exist for each MDB deployment.Default value is 10.
+portlet.openejb.help.instancelimitdesc = Specifies the maximum number of bean instances that are allowed to exist for each MDB deployment. Default value is 10.
portlet.openejb.help.jndiname = JNDI Names
-portlet.openejb.help.jndinamedesc = Comma separated list of JNDI names for the EJB.
+portlet.openejb.help.jndinamedesc = Comma-separated list of JNDI names for the EJB.
portlet.openejb.help.ki = Known implementations
portlet.openejb.help.ki1 = org.apache.openejb.core.stateful.RAFPassivater
portlet.openejb.help.ki2 = org.apache.openejb.core.stateful.SimplePassivater
@@ -57,7 +57,7 @@
portlet.openejb.help.mli = MessageListenerInterface
portlet.openejb.help.mlidesc = Specifies the message listener interface handled by this container. Default value is javax.jms.MessageListener.
portlet.openejb.help.passivator = Passivator
-portlet.openejb.help.passivatordesc = The passivator is responsible for writing beans to disk at passivation time. Different passivators can be used by setting this property to the fully qualified class name of the PassivationStrategy implementation. The passivator is not responsible for invoking any callbacks or other processing, its only responsibly is to write the bean state to disk.
+portlet.openejb.help.passivatordesc = The passivator is responsible for writing beans to disk at passivation time. Different passivators can be used by setting this property to the fully qualified class name of the PassivationStrategy implementation. The passivator is not responsible for invoking any callbacks or other processing. Its only responsibility is to write the bean state to disk.
portlet.openejb.help.primarykeyclass = Primary Key Class
portlet.openejb.help.primarykeyclassdesc = Primary Key class of the EJB(if any).
portlet.openejb.help.primarykeyfield = Primary Key Field
@@ -69,17 +69,17 @@
portlet.openejb.help.sei = Service EndPoint Interface
portlet.openejb.help.seidesc = Service Endpoint Interface if the stateless EJB is exposed as a web service.
portlet.openejb.help.sfpoolsize = PoolSize
-portlet.openejb.help.sfpoolsizedesc = Specifies the size of the bean pools for this stateful SessionBean container.Default value is 1000.
+portlet.openejb.help.sfpoolsizedesc = Specifies the size of the bean pools for this stateful SessionBean container. Default value is 1000.
portlet.openejb.help.sftimeout = TimeOut
-portlet.openejb.help.sftimeoutdesc = Specifies the time to wait between invocations. This value is measured in minutes. A value of 5 would result in a time-out of 5 minutes between invocations.A value of zero would mean no timeout.Default value is 20.
+portlet.openejb.help.sftimeoutdesc = Specifies the time to wait between invocations. This value is measured in minutes. A value of 5 results in a time-out of 5 minutes between invocations. A value of zero means no timeout. Default value is 20.
portlet.openejb.help.slpoolsize = PoolSize
portlet.openejb.help.slpoolsizedesc = Specifies the size of the bean pools for this stateless SessionBean container. Default value is 10.
portlet.openejb.help.sltimeout = TimeOut
-portlet.openejb.help.sltimeoutdesc = Specifies the time to wait between invocations. This value is measured in milliseconds. A value of 5 would result in a time-out of 5 milliseconds between invocations.A value of zero would mean no timeout.Default value is 0.
+portlet.openejb.help.sltimeoutdesc = Specifies the time to wait between invocations. This value is measured in milliseconds. A value of 5 results in a time-out of 5 milliseconds between invocations. A value of zero means no timeout. Default value is 0.
portlet.openejb.help.statefulcontainer = Stateful Container
portlet.openejb.help.statelesscontainer = Stateless Container
portlet.openejb.help.strictpooling = StrictPooling
-portlet.openejb.help.strictpoolingdesc = StrictPooling tells the container what to do when the pool reaches it's maximum size and there are incoming requests that need instances.With strict pooling, requests will have to wait for instances to become available. The pool size will never grow beyond the the set PoolSize value.Without strict pooling, the container will create temporary instances to meet demand. The instances will last for just one method invocation and then are removed. Default value is true.
+portlet.openejb.help.strictpoolingdesc = StrictPooling tells the container what to do when the pool reaches its maximum size and there are incoming requests that need instances. With strict pooling, requests will have to wait for instances to become available. The pool size will never grow beyond the the set PoolSize value. Without strict pooling, the container will create temporary instances to meet demand. The instances will last for just one method invocation and then are removed. Default value is true.
portlet.openejb.help.title = The EJB Server portlet allows you to see the different OpenEJB containers deployed on the server. It allows you to set the configurable attributes of those containers as well as view information on the EJBs that are deployed on that container.
portlet.openejb.view.beanclassname = Bean Class Name
portlet.openejb.view.boolean = The value of {0} should be either true or false.
@@ -101,7 +101,7 @@
portlet.openejb.view.primarykeyclass = Primary Key Class
portlet.openejb.view.primarykeyfield = Primary Key Field
portlet.openejb.view.remoteinterface = Remote Interface
-portlet.openejb.view.restart = Please restart the openejb configuration for the changes to take effect.
+portlet.openejb.view.restart = Restart the openejb configuration for the changes to take effect.
portlet.openejb.view.sepinterface = Service EndPoint Interface
portlet.openejb.view.unchanged = An unexpected error has occurred and the value cannot be set.
portlet.openejb.view.unrestarted = The openejb configuration should be restarted for the changes that were made to the fields to take effect. The changed fields are now shown in red color.
Propchange: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties Mon Dec 7 08:23:55 2009
@@ -16,7 +16,7 @@
#=====================================================================
plancreator.archive.archive = Archive
-plancreator.archive.archiveErr = The archive you provided is not a WAR. Please note that only WARs are supported as of now.
+plancreator.archive.archiveErr = The archive you provided is not a WAR. Only WARs are supported as of now.
plancreator.archive.config = Configure
plancreator.common.action = Action
plancreator.common.add = Add
@@ -49,21 +49,21 @@
plancreator.env.checked = CHECKED
plancreator.env.classpathSetting = Classpath Settings
plancreator.env.context = Web Context Root
-plancreator.env.contextDisc = This is the first part of the URL used to access the Web application by the client. For example, if the context-root is entered as "HelloWorld", then a typical URL to the application would start with "http://host:port/HelloWorld/".
+plancreator.env.contextDisc = This is the first part of the URL used to access the Web application by the client. For example, if the context-root is entered as "HelloWorld", a typical URL to the application would start with "http://host:port/HelloWorld/".
plancreator.env.desc = Defaults in this page should suffice for typical scenarios.
-plancreator.env.groupId = Group Id
-plancreator.env.groupIdDesc = A name identifying a group of related modules. This may be a project name, a company name, etc. The important thing is that each artifactID should be unique within the group.
+plancreator.env.groupId = Group ID
+plancreator.env.groupIdDesc = A name identifying a group of related modules. This might be a project name, a company name, etc. The important thing is that each artifactID must be unique within the group.
plancreator.env.hiddenClasses = Hidden Classes
-plancreator.env.hiddenClassesDesc = List packages or classes that may be in a parent class loader, but should not be exposed from there to the Web application. This is typically used when the Web plication wants to use a different version of a library than that of it's parent configuration (or Geronimo itself) uses. Separate multiple package/class names with a semicolon ';'
+plancreator.env.hiddenClassesDesc = List packages or classes that might be in a parent class loader, but should not be exposed from there to the Web application. This is typically used when the Web application wants to use a different version of a library than that of its parent configuration (or Geronimo itself) uses. Separate multiple package/class names with a semicolon ';'
plancreator.env.id = Web Application Identity
-plancreator.env.idDesc = Every module in Geronimo is uniquely identified by it's ModuleID which consists of four components: groupId/artifactId/version/type. Example: "org.apache.geronimo.plugins/plancreator-tomcat/2.1/car".
+plancreator.env.idDesc = Every module in Geronimo is uniquely identified by its ModuleID which consists of four components: groupId, artifactId, version, and type. Example: "org.apache.geronimo.plugins/plancreator-tomcat/2.1/car".
plancreator.env.inverseClassLoading = Inverse Class Loading
plancreator.env.inverseClassLoadingDesc = Normally (if this element is not checked), the module's class loader will work normally - classes will be loaded from the parent class loader if available before checking the current class loader. If this element is checked, that behavior is reversed and the current class loader will always be checked first before looking in the parent class loader. This is often enabled to give the JARs in WEB-INF/lib precedence over anything that might be in a parent class loader.
plancreator.env.nonOverridableClass = Non Overridable Classes
-plancreator.env.nonOverridableClassDesc = List packages or classes that the Web application should always load from a parent class loader, and never load from WEB-INF/lib or WEB-INF/classes. This might be used to force a Web application to share the same instance of a common library with other Web applications, even if they each include it in their own WAR. Separate multiple package/class names with a semicolon ';'
+plancreator.env.nonOverridableClassDesc = List packages or classes that the Web application should always load from a parent class loader, and never load from WEB-INF/lib or WEB-INF/classes. This might be used to force a Web application to share the same instance of a common library with other Web applications, even if they each include it in their own WAR. Separate multiple package/class names with a semicolon ';'
plancreator.env.title = <b>WAR - Environment</b> -- Configure Web Application Identity and Class Path
plancreator.env.type = Type
-plancreator.env.typeDesc = A module's type is normally either CAR (for a system module) or the file extension for an application module (ear,war,jar,etc).
+plancreator.env.typeDesc = A module's type is normally either CAR (for a system module) or the file extension for an application module (ear,war,jar,and so on).
plancreator.env.version = Version
plancreator.env.versionDesc = Version number for the module.
plancreator.reference.desc = Map the references declared in your Web application to specific items available in the server environment. References declared in your web-app (ex. EJB, EJB Local, JDBC Connection Pool, JavaMail Session, JMS Connection Factory and JMS Destination references) are shown below to the left and the resources (available in the server environment) to which they can be linked are shown to the right.
@@ -85,10 +85,10 @@
plancreator.reference.jmsConnReference = JMS Connection Factory References
plancreator.reference.jmsRef = JMS Ref
plancreator.reference.jmsReference = JMS Destination References
-plancreator.reference.resolveErr = Some of the references are not resolved. Please resolve them and only then press Next button.
+plancreator.reference.resolveErr = Some of the references are not resolved. Resolve them and only then press Next button.
plancreator.reference.title = <b>WAR - References</b> -- Resolve EJB, EJB Local, JDBC Connection Pool, JavaMail Session, JMS Connection Factory, JMS Destination and Web Service References
plancreator.reference.tree = EAR tree goes here
-plancreator.reference.wsDesc = Service references declared in your application are shown below to the left. If the WSDL doesn't contain the port information to contact the service or if that information is ambiguous, then resolve the service-ref by clicking on "Add Port".
+plancreator.reference.wsDesc = Service references declared in your application are shown below to the left. If the WSDL doesn't contain the port information to contact the service or if that information is ambiguous, resolve the service-ref by clicking on "Add Port".
plancreator.reference.wsRef = Service Ref Name
plancreator.reference.wsReference = Web Service References
plancreator.security.advancedSetting = Advanced Settings
@@ -112,9 +112,9 @@
plancreator.security.role = Role
plancreator.security.roleMapping = Security Role Mappings
plancreator.security.roleMappingDesc = Security roles declared in web.xml are shown below to the left. Map them to specific principals present in Geronimo's security realms by adding Principals, Login Domain Principals, Realm Principals and/or Distinguished Names.
-plancreator.security.roleMappingErr = Please enter a unique principal name for this role
+plancreator.security.roleMappingErr = Enter a unique principal name for this role
plancreator.security.roleTree = Security roles tree
-plancreator.security.runAsSubjectDesc = The run-as-subject is required when the module is to continue as if run by the specified subject when constrained to the specified role.
+plancreator.security.runAsSubjectDesc = The run-as-subject is required when the module that is constrained to the specified role continues to be run by the specified subject.
plancreator.security.runAsSubjectsTree = Run-as-subjects tree
plancreator.security.securityRealmName = Security Realm Name
plancreator.security.securityRealmNameDesc = Select the Geronimo security realm that will authenticate user logins.
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:23:55 2009
@@ -19,10 +19,10 @@
Plan\ Creator = Plan Creator
-errorMsg01 = The archive you provided is not a WAR. Please note that only WARs are supported as of now.
+errorMsg01 = The archive you provided is not a WAR. Only WARs are supported as of now.
errorMsg02 = Deployment failed.
-errorMsg03 = Some of the references are not resolved. Please resolve them and only then press Next button.
+errorMsg03 = Some of the references are not resolved. Resolve them and only then press Next button.
infoMsg01 = The application was successfully deployed.<br/>The application was successfully started.
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:23:55 2009
@@ -29,14 +29,14 @@
Run\ SQL = Run SQL
-sysdb.errorMsg01 = Error encountered while creating database.
-sysdb.errorMsg02 = Error encountered while closing database connection.
-sysdb.errorMsg03 = Error encountered while shutting down database.
-sysdb.errorMsg04 = Error encountered while backing up database.
-sysdb.errorMsg05 = Error encountered while renaming database folder.
-sysdb.errorMsg06 = Error encountered while deleting database.
-sysdb.errorMsg07 = SQL command can't be empty.
-sysdb.errorMsg08 = Error encountered while executing SQL command(s).
+sysdb.errorMsg01 = An error encountered while creating database.
+sysdb.errorMsg02 = An error encountered while closing database connection.
+sysdb.errorMsg03 = An error encountered while shutting down database.
+sysdb.errorMsg04 = An error encountered while backing up database.
+sysdb.errorMsg05 = An error encountered while renaming database folder.
+sysdb.errorMsg06 = An error encountered while deleting database.
+sysdb.errorMsg07 = SQL command cannot be empty.
+sysdb.errorMsg08 = An error encountered while executing SQL command(s).
sysdb.errorMsg09 = Unable to deploy: {0}.
sysdb.errorMsg10 = Unable to load driver {0}.
sysdb.errorMsg11 = The import operation failed!
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties Mon Dec 7 08:23:55 2009
@@ -23,11 +23,11 @@
Database\ Pools = æ°æ®åºè¿æ¥æ±
-Derby\ Log\ Viewer = Derbyæ¥å¿æ¥çå¨
+Derby\ Log\ Viewer = Derby æ¥å¿æ¥çå¨
Embedded\ DB = å
ç½®æ°æ®åº
-Run\ SQL = è¿è¡SQL
+Run\ SQL = è¿è¡ SQL
sysdb.errorMsg01 = å建æ°æ®åºæ¶éå°é误ã
sysdb.errorMsg02 = å
³éæ°æ®åºè¿æ¥æ¶éå°é误ã
@@ -35,13 +35,13 @@
sysdb.errorMsg04 = å¤ä»½æ°æ®åºæ¶éå°é误ã
sysdb.errorMsg05 = éå½åæ°æ®åºæ件夹æ¶éå°é误ã
sysdb.errorMsg06 = å é¤æ°æ®åºæ¶éå°é误ã
-sysdb.errorMsg07 = 空SQLå½ä»¤ã
-sysdb.errorMsg08 = æ§è¡SQLå½ä»¤æ¶éå°é误ã
+sysdb.errorMsg07 = 空 SQ Lå½ä»¤ã
+sysdb.errorMsg08 = æ§è¡ SQL å½ä»¤æ¶éå°é误ã
sysdb.errorMsg09 = æ æ³é¨ç½²:{0}ã
sysdb.errorMsg10 = æ æ³å 载驱å¨{0}ã
sysdb.errorMsg11 = 导å
¥è¿æ¥æ± 失败ï¼
sysdb.infoMsg01 = å·²å建æ°æ®åºï¼<b>{0}</b>ã
sysdb.infoMsg02 = å·²å é¤æ°æ®åºï¼<b>{0}</b>ã
-sysdb.infoMsg03 = SQLå½ä»¤æ§è¡æåã
+sysdb.infoMsg03 = SQL å½ä»¤æ§è¡æåã
sysdb.infoMsg04 = è¿æ¥å°{0}ã
sysdb.warnMsg01 = ä¸åå¨é¢å®ä¹çæ°æ®åºè¿æ¥æ± ã
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties Mon Dec 7 08:23:55 2009
@@ -20,8 +20,8 @@
dbwizard.basicParams.driverConnectionProperties = Driver Connection Properties
dbwizard.basicParams.host = Host
dbwizard.basicParams.port = Port
-dbwizard.basicParams.propertyExp = A property used to connect to {0}. May be optional (see JDBC driver documentation).
-dbwizard.basicParams.seeDocumentation = See the documentation for your JDBC driver.
+dbwizard.basicParams.propertyExp = A property used to connect to {0}. This property can be optional. See JDBC driver documentation.
+dbwizard.basicParams.seeDocumentation = See the JDBC documentation for your JDBC driver.
dbwizard.basicParams.title = <b>Create Database Pool</b> -- Step 2: Select Driver, JAR, Parameters
dbwizard.basicParams.typicalJDBCURL = Typical JDBC URL
dbwizard.basicParams.unableToLoadDriver = Unable to load driver from selected JARs!
@@ -47,7 +47,7 @@
dbwizard.common.driverTransactionTypes = Type of transactions that this connection pool supports.
dbwizard.common.edit = Edit
dbwizard.common.editSettings = Edit Settings
-dbwizard.common.emptyText = The focussed field must not be empty.
+dbwizard.common.emptyText = The focussed field cannot be empty.
dbwizard.common.finish = Finish
dbwizard.common.idleTimeout = Idle Timeout
dbwizard.common.import = {0} Import
@@ -55,7 +55,7 @@
dbwizard.common.importFromWebLogic = Import from WebLogic 8.1
dbwizard.common.inMilliseconds = in milliseconds
dbwizard.common.inMinutes = in minutes
-dbwizard.common.maxNoOfCon = The maximum number of connections in the pool. The default is 10.
+dbwizard.common.maxNoOfCon = The maximum number of connections in the pool. The default value is 10.
dbwizard.common.name = Name
dbwizard.common.next = Next
dbwizard.common.passwordMismatch = Password does not match.
@@ -78,7 +78,7 @@
dbwizard.confirmURL.maxNoOfCon = The maximum number of connections in the pool. Leave blank for default.
dbwizard.confirmURL.minimumNoOfCon = The minimum number of connections in the pool. Leave blank for default.
dbwizard.confirmURL.title = <b>Create Database Pool</b> -- Step 3: Final Pool Configuration
-dbwizard.downloadStatus.summary = This page monitors the driver download progress.
+dbwizard.downloadStatus.summary = This page shows the driver download progress.
dbwizard.downloadStatus.title = <b>Create Database Pool</b> -- Driver Download
dbwizard.edit.basicConProperties = Basic Connection Properties
dbwizard.edit.blockingTimeoutExp = The length of time a caller will wait for a connection. The default is 5000.
@@ -91,10 +91,10 @@
dbwizard.edit.maxNoOfCon = The maximum number of connections in the pool. The default is 10.
dbwizard.edit.minimumNoOfCon = The minimum number of connections in the pool. The default is 0.
dbwizard.edit.poolName = Pool Name
-dbwizard.edit.poolNameExp = A name that is different than the name for any other database pools in the server (no spaces in the name please).
+dbwizard.edit.poolNameExp = A name that is different than the name for any other database pools in the server. Do not type spaces in the pool name.
dbwizard.edit.poolType = Pool Type
-dbwizard.edit.seeDocumentation = See the documentation for your JDBC driver.
-dbwizard.edit.seeLog = see the log for details
+dbwizard.edit.seeDocumentation = See the JDBC documentation for your JDBC driver.
+dbwizard.edit.seeLog = See the log for details
dbwizard.edit.summary = This page edits an existing database pool.
dbwizard.edit.unableToLoadDriver = Unable to load driver from selected JARs!
dbwizard.importStatus.currentPools = Current Pools in Server
@@ -103,16 +103,16 @@
dbwizard.importStatus.importStatus = Import Status
dbwizard.importStatus.originalJNDI = Original JNDI
dbwizard.importStatus.originalName = Original Name
-dbwizard.importStatus.summary = The list of recognized database pools appears below. You can deploy any pools to Geronimo that were configured as plain JDBC pools, or XA pools where Geronimo has a supported XA adapter. Below the pool list is the list of status messages from the import process.
+dbwizard.importStatus.summary = The following list shows recognised database pools. You can deploy any pools to Geronimo that were configured as plain JDBC pools, or XA pools where Geronimo has a supported XA adapter. Below the pool list is the list of status messages from the import process.
dbwizard.importStatus.title = <b>Import Database Pools</b> -- Step 2: Review Imported Data
dbwizard.importUpload.aboutWebLogic = If WebLogic 8.1 is installed on the same machine as Geronimo, and the WebLogic domain directory is readable by the user running Geronimo, you can also point directly to the WebLogic installation and domain directories. This has the advantage that the import process can read the database passwords, whereas if you just import a <tt>config.xml</tt> above you'll need to re-enter all the passwords.
dbwizard.importUpload.alternateImport = Alternate {0} Import
dbwizard.importUpload.domainDirectoryPath = Domain directory path
-dbwizard.importUpload.domainDirectoryPathExp = Please enter the full path to the WebLogic domain directory (containing the <tt>config.xml</tt> file) for your WebLogic domain .
-dbwizard.importUpload.enterFullPath = Please enter the full path to the <tt>weblogic81/server/lib</tt> directory for your WebLogic 8.1 installation .
-dbwizard.importUpload.path = path
-dbwizard.importUpload.pleaseSelect = Please select the
-dbwizard.importUpload.summary = This page starts the process of importing database pools from another application server. To do the import, you'll need to upload a configuration file from the other server using the fields below. After that, we'll convert the values we can, and ask you to confirm the configuration for each pool we find in the configuration.
+dbwizard.importUpload.domainDirectoryPathExp = Enter the full path to the WebLogic domain directory (containing the <tt>config.xml</tt> file) for your WebLogic domain .
+dbwizard.importUpload.enterFullPath = Enter the full path to the <tt>weblogic81/server/lib</tt> directory for your WebLogic 8.1 installation .
+dbwizard.importUpload.path = Path
+dbwizard.importUpload.pleaseSelect = Select the
+dbwizard.importUpload.summary = This page starts the process of importing database pools from another application server. To do the import, you must upload a configuration file from the other server using the fields below. Geronimo server will convert the configuration information into Geronimo specific values, and ask you to confirm the configuration for each pool in the configuration.
dbwizard.importUpload.title = <b>Import Database Pools</b> -- Step 1: Upload Configuration File
dbwizard.list.createPool = Create a new database pool
dbwizard.list.deployedAs = Deployed As
@@ -158,14 +158,14 @@
dbwizard.tranql-connector-db2-xa.PortNumber = Port Number
dbwizard.tranql-connector-db2-xa.PortNumberExp = Specifies the port number the remote database server is listening on for incoming connections. The default for a DB2 server is 50000.
dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSize = PreparedStatement Cache Size
-dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = PreparedStatementCacheSize tells the driver how many prepared statements should be associated with each connection. The default is no statement caching.
+dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = PreparedStatementCacheSize specifies the driver how many prepared statements should be associated with each connection. The default is no statement caching.
dbwizard.tranql-connector-db2-xa.ResultSetHoldability = ResultSetHoldability
dbwizard.tranql-connector-db2-xa.ResultSetHoldabilityExp = ResultSetHoldability has two possible values: HOLD_CURSORS_OVER_COMMIT and CLOSE_CURSORS_AT_COMMIT. Either of these values can be specified with any valid combination of resultSetConcurrency and resultSetHoldability. The value that you set overrides the default holdability for the connection.<br/><br/>HOLD_CURSORS_OVER_COMMIT = 1<br/>CLOSE_CURSORS_AT_COMMIT = 2
dbwizard.tranql-connector-db2-xa.ServerName = Server Name
-dbwizard.tranql-connector-db2-xa.ServerNameExp = ServerName is the name / IP address of the host which the DB2 driver needs to connect to. There is no default.
+dbwizard.tranql-connector-db2-xa.ServerNameExp = ServerName is the name or IP address of the host that the DB2 driver needs to connect to. There is no default value.
dbwizard.tranql-connector-db2-xa.TraceFile = Trace File
dbwizard.tranql-connector-db2-xa.TraceFileAppend = TraceFileAppend
-dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = Specifies whether to append to or overwrite the file that is specified by the traceFile property. The data type of this property is boolean. The default is false, which means that the file that is specified by the traceFile property is overwritten.
+dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = TraceFileAppend specifies whether to append to or overwrite the file that is specified by the traceFile property. The data type of this property is boolean. The default value is false, which means that the file that is specified by the traceFile property is overwritten.
dbwizard.tranql-connector-db2-xa.TraceFileExp = Name of the tracefile to place trace records into.
dbwizard.tranql-connector-db2-xa.UserName = User Name
dbwizard.tranql-connector-db2-xa.UserNameExp = The name of the userID used to connect to the remote database server.
@@ -336,48 +336,48 @@
dbwizard.tranql-connector-postgresql-xa.UserName = User Name
dbwizard.tranql-connector-postgresql-xa.UserNameExp = Username used to establish the physical connection.
dbwizard.tranql-connector-sqlserver2000-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = The name of the SQL Server database to which you want to connect.
+dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = The name of the SQL Server database to connect to.
dbwizard.tranql-connector-sqlserver2000-xa.Password = Password
dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = The case-insensitive password used to connect to your SQL Server database.
dbwizard.tranql-connector-sqlserver2000-xa.PortNumber = Port Number
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = The TCP port of the SQL Server, default 1433.
+dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = The TCP port of the SQL Server, the default is 1433.
dbwizard.tranql-connector-sqlserver2000-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}. Consult microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
+dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}. Refer to Microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
dbwizard.tranql-connector-sqlserver2000-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Consult microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slighty slower under some circumstances.
+dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Refer to Microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slighty slower under some circumstances.
dbwizard.tranql-connector-sqlserver2000-xa.ServerName = Server Name
dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = The IP address of the SQL Server.
dbwizard.tranql-connector-sqlserver2000-xa.UserName = User Name
-dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = The case-insensitive user name used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = The case-insensitive username used to connect to your SQL Server database.
dbwizard.tranql-connector-sqlserver2005-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = The name of the SQL Server database to which you want to connect.
+dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = The name of the SQL Server database to connect to.
dbwizard.tranql-connector-sqlserver2005-xa.Password = Password
dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = The case-insensitive password used to connect to your SQL Server database.
dbwizard.tranql-connector-sqlserver2005-xa.PortNumber = Port Number
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = The TCP port of the SQL Server, default 1433.
+dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = The TCP port of the SQL Server, the default is 1433.
dbwizard.tranql-connector-sqlserver2005-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}. Consult microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
+dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}. Refer to Microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
dbwizard.tranql-connector-sqlserver2005-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Consult microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slighty slower under some circumstances.
+dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Refer to Microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slightly slower under some circumstances.
dbwizard.tranql-connector-sqlserver2005-xa.ServerName = Server Name
dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = The IP address of the SQL Server.
dbwizard.tranql-connector-sqlserver2005-xa.UserName = User Name
-dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = The case-insensitive user name used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = The case-insensitive username used to connect to your SQL Server database.
dbwizard.usage.applicationCode = Application Code
dbwizard.usage.geronimo_webExp = <p>To point the resource reference to a specific database pool in Geronimo, the web application needs to have a <tt>geronimo-web.xml</tt> deployment plan. That may be packaged in the WAR in the <tt>WEB-INF</tt> directory, or it may be provided separately on the command line to the deploy tool. The <tt>geronimo-web.xml</tt> plan should have a <tt>dependency</tt> element pointing to the database pool module, and a <tt>resource-ref</tt> block corresponding to the <tt>web.xml</tt> <tt>resource-ref</tt> above, which maps the resource reference to a specific database pool. In that block, the <tt>ref-name</tt> must match the <tt>res-ref-name</tt> from the <tt>web.xml</tt> (above) and the <tt>resource-link</tt> must point to the database pool by name.</p> <p><i>If you have only one pool named {0} deployed in Geronimo, you can point to it like this.</i></p>
dbwizard.usage.moreThanOnePool = If you have more than one pool named {0} (for example, two dependencies that <b>each</b> include a component named {1}), then you can specify the pool to use more explicitly like this:
dbwizard.usage.resource_refSection = The <tt>web.xml</tt> should have a <tt>resource-ref</tt> section declaring the database pool, like this. Note the <tt>res-ref-name</tt>, which is what we'll need to map the reference to a pool, and also what the application will need in order to access the pool.
dbwizard.usage.searchOnlyOne = That will search for a pool named {0} in the current application and any modules listed as dependencies (and their dependencies, etc.).
-dbwizard.usage.title = This page talks about how to use the database pool {0} from a J2EE application. The example here is a web application, but other application modules would work in the same way.
+dbwizard.usage.title = This page shows how to use the database pool {0} from a Java EE application. The example here is a Web application, but other application modules would work in the same way.
dbwizard.usage.usingInCode = To get a reference to the database pool, your application can use code like this. Note that the JNDI lookup string is <tt>java:comp/env/</tt> plus the <tt>res-ref-name</tt> used in <tt>web.xml</tt> (above).
-derbylogmanager.help.title = This portlet views the log file for Geronimo's internal database, Derby.
+derbylogmanager.help.title = This portlet shows the log file for Geronimo's internal database, Derby.
derbylogmanager.view.Lines = Lines
derbylogmanager.view.containingText = Containing text
derbylogmanager.view.filterLog = Filter Log
derbylogmanager.view.filterResults = Filter results
derbylogmanager.view.integer = The focussed field must be an integer.
-derbylogmanager.view.matchCriterial = {0} total message(s) in log file. {1} matched your criteria
+derbylogmanager.view.matchCriterial = {0} total message(s) in log file. {1} matched your criteria.
derbylogmanager.view.maxResults = Max Results
derbylogmanager.view.noEntries = No entries found with the specified criteria.
derbylogmanager.view.numberOfResultsCapped = number of results capped
@@ -408,7 +408,7 @@
internaldb.common.driverName = Driver Name
internaldb.common.driverVersion = Driver Version
internaldb.common.empty = Empty
-internaldb.common.emptyText = The focussed field must not be empty.
+internaldb.common.emptyText = The focussed field cannot be empty.
internaldb.common.etc = Etc
internaldb.common.functions = Functions
internaldb.common.note = Note
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties Mon Dec 7 08:23:55 2009
@@ -25,16 +25,16 @@
apache.jk.ajpPort.networkPortExplanation = <tt>mod_jk</tt> talks to the Geronimo web container using a protocol called AJP. Currently, you do not have an AJP protocol listener configured for the web container. Select a network port here, and an AJP protocol listener will be added for you.
apache.jk.ajpPort.title = <b>Apache mod_jk</b> -- AJP Port
apache.jk.config.logFileLocation = <tt>mod_jk</tt> log file location
-apache.jk.config.logFileLoctionExplanation = <tt>mod_jk</tt> writes to a log file in a location you choose. The log file location needs to be set in the Apache configuration. Please select the location where the <tt>mod_jk</tt> log file should be written.
+apache.jk.config.logFileLoctionExplanation = <tt>mod_jk</tt> writes to a log file in a location you choose. The log file location needs to be set in the Apache configuration. Select the location where the <tt>mod_jk</tt> log file should be written.
apache.jk.config.operatingSystem = Operating System
apache.jk.config.operatingSystemExplanation = The process for installing <tt>mod_jk</tt> depends on the operating system. For some, we can provide specific guidance. For others, you'll have to install <tt>mod_jk</tt> on your own.
apache.jk.config.pathToProperties = Path to <tt>workers.properties</tt>
apache.jk.config.pathToPropertiesExplanation = <tt>mod_jk</tt> requires a file called <tt>workers.properties</tt> to specify which app servers can be contacted on which network ports, etc. This tool will generate the contents for the <tt>workers.properties</tt> file, but it also needs to point to this file in the Apache configuration data, so we need to know where you plan to put this file.
apache.jk.config.title = <b>Apache mod_jk</b> -- Basic Configuration
apache.jk.index.frag1 = This tool walks you through the process of configuring access to Geronimo through the Apache 2 HTTP server using the <tt>mod_jk</tt> Apache module. There are several steps needed to do this:
-apache.jk.index.frag2 = By answering a few questions here, we can give you specific guidance and generate configuration information you can use.
+apache.jk.index.frag2 = Answer a few questions here, and we can give you specific guidance and generate configuration information you can use.
apache.jk.index.getStarted = Get Started
-apache.jk.index.notes = </li></ul><p>Notes:</p><ul><li>Geronimo does not remember previous settings generated using this tool;you'll need to reenter all the data each time, or just paste the new information into your existing configuration files.</li> <li>Any web applications to be exposed via Apache must be running when you run this tool, and of course must be running to be accessed from Apache.</li></ul>
+apache.jk.index.notes = </li></ul><p>Notes:</p><ul><li>Geronimo does not remember previous settings generated using this tool; you need to reenter all the data each time, or just paste the new information into your existing configuration files.</li> <li>Any web applications to be exposed by Apache must be running when you run this tool, and of course must be running to be accessed from Apache.</li></ul>
apache.jk.index.severalSteps = <ol><li>Configure the Geronimo web container to support the AJP protocol</li><li>Install the <tt>mod_jk.so</tt> Apache module (compiling it if necessary)</li><li>Create a <tt>workers.properties</tt> configuration file to point Apache to the Geronimo AJP connector</li><li>Add Apache configuration information indicating which URLs should be sent to Geronimo and whether Apache should serve static content (leaving only dynamic content within the web application to Geronimo)</li></ol>
apache.jk.results.alreadyHasAJPListener = This Geronimo configuration already has an AJP listener running on port {0}. Nothing further needs to be done here.
apache.jk.results.anAJPLisstnerAdded = An AJP listener was added on port {0}. Nothing further needs to be done here.
@@ -43,7 +43,7 @@
apache.jk.results.howToActivateOthers = adding the following line to <tt>/etc/httpd/conf/httpd.conf</tt>:</p><pre>LoadModule jk_module modules/mod_jk.so</pre> <p>Then you can start Apache by running <tt>service httpd start</tt> (or <tt>service httpd restart</tt>).
apache.jk.results.howToActivateifOsSuSE = editing <tt>/etc/sysconfig/apache2</tt> and adding <tt>jk</tt> to the value configured for <tt>APACHE_MODULES</tt> and then running (as root) <tt>SuSEconfig</tt> followed by <tt>rcapache2 start</tt> (or <tt>rcapache2 restart</tt>).
apache.jk.results.noInstructionsToInstall = </p><p>Based on your operating system selection, I don't have specific instructions to install <tt>mod_jk</tt>. You may be able to get a binary release from <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/"> http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/</a>. Otherwise, you'll have to build from source.</p><p>To enable <tt>mod_jk</tt> in Apache, you typically need to install the <tt>.so</tt> (Linux/UNIX/Mac OS X) or <tt>.dll</tt> (Windows) and then add a line to the <tt>httpd.conf</tt> file like this:</p> <pre> LoadModule jk_module modules/mod_jk.so</pre> <p>Finally, start or restart Apache.</p>
-apache.jk.results.saveFollowingToFile = You have decided to save this file at <tt> {0} </tt>. Please save the following content to that file.
+apache.jk.results.saveFollowingToFile = You have decided to save this file at <tt> {0} </tt>. Save the following content to that file.
apache.jk.results.saveWhereIfSuSE = For SuSE, this should be saved to a file in the Apache conf.d dir, e.g.write this content to <tt>/etc/apache2/conf.d/geronimo-jk.conf</tt>
apache.jk.results.saveWhereOthwise = This information should be added to the Apache configuration file. This is often at a location such as <tt>/etc/httpd/conf/httpd.conf</tt>
apache.jk.results.step1 = Step 1: Configure Geronimo for AJP
@@ -52,7 +52,7 @@
apache.jk.results.step3 = Step 3: Create a <tt>workers.properties</tt> file
apache.jk.results.step4 = Step 4: Apache Configuration<h2>
apache.jk.results.step5 = Step 5: Restart Apache
-apache.jk.results.step5Content = With those steps completed, Apache should be ready to go! Start Geronimo and restart Apache and try accessing a Geronimo web application through an Apache URL. If there are any problems, check the Apache error log, and the mod_jk error log (at <tt>{0}</tt>).
+apache.jk.results.step5Content = With those steps completed, Apache should be ready to go! Start Geronimo and restart Apache and try accessing a Geronimo web application through an Apache URL. If there are any problems, check the Apache error log and the mod_jk error log (at <tt>{0}</tt>).
apache.jk.results.summary = This page lists the things you must do to enable <tt>mod_jk</tt> in Apache and configure it to talk to Geronimo.
apache.jk.results.title = <b>Apache mod_jk</b> -- Configuration Results
apache.jk.webApps.dynamicPaths = Dynamic Paths
@@ -81,7 +81,7 @@
ca.common.commonName = Common Name
ca.common.company_Organization = Company/Organization
ca.common.countryCode = Country Code
-ca.common.criticalExt = critical ext
+ca.common.criticalExt = Critical ext
ca.common.detailsOfCert = Details of the Certificate to be issued
ca.common.emptyText = The focussed field must not be empty.
ca.common.fingerPrints = Finger prints
@@ -95,7 +95,7 @@
ca.common.lockCA = Lock CA
ca.common.mmddyyyy = The focussed field must be a date in MM/DD/YYYY format.
ca.common.noRequests = There are no requests.
-ca.common.nonCriticalExt = non-critical ext
+ca.common.nonCriticalExt = Non-critical ext
ca.common.passwordMismatch = Password does not match.
ca.common.processCSR = Process CSR
ca.common.publicKey = Public Key
@@ -118,19 +118,19 @@
ca.common.viewCADetails = View CA Details
ca.common.viewIssuedCert = View Issued Certificate
ca.common.wrongDate = To Date must be after From Date.
-ca.confirmCA.summary = This screen lets you review the CA details entered in the previous screen. If you need to modify any information shown here, please go back to the previous screen. Upon clicking the <i>Setup Certification Authority</i> button, a keypair and a self-signed certificate will be generated and stored in a keystore. CA's certificate serial number is stored in a text file and the number is incremented each time a CSR is processed by the CA.
+ca.confirmCA.summary = This screen lets you review the CA details entered in the previous screen. If you need to modify any information shown here, go back to the previous screen. Once you click the <i>Setup Certification Authority</i> button, a keypair and a self-signed certificate will be generated and stored in a keystore. CA's certificate serial number is stored in a text file and the number is incremented each time a CSR is processed by the CA.
ca.confirmCA.title = <b>Setup Certification Authority</b> - Step 2: Review and Confirm CA details
ca.confirmCertReq.approveCSR = Approve CSR
ca.confirmCertReq.confirmCertRequest = Confirm Certificate Request
ca.confirmCertReq.rejectCSR = Reject CSR
ca.confirmCertReq.summary = This screen shows the details of the Certificate Signing Request (CSR) and allows you to approve the request. Once the request is approved, it will be considered for issue of a certificate.
ca.confirmClientCert.issueCert = Issue Certificate
-ca.confirmClientCert.summary = This screen shows the CSR details and the certificate details entered in the previous screen. Upon clicking the <i>Issue Certificate</i> button, a certificate will be issued and stored. The next screen will show the details of the certificate issued.
+ca.confirmClientCert.summary = This screen shows the CSR details and the certificate details entered in the previous screen. Once you click the <i>Issue Certificate</i> button, a certificate will be issued and stored. The next screen will show the details of the certificate issued.
ca.confirmClientCert.title = <b>Issue New Certificate</b> - Step 3: Confirm and Issue Certificate
ca.index.CAFunctionsAccessed = CA functions can be accessed using the links provided below.
ca.index.CAInitialized = CA has been initialized.
-ca.index.CALocked = But, the CA is locked. Please unlock the CA to access CA functions.
-ca.index.CANotInitialized = CA is not running or the CA may not have been initialized. Please initialize the CA using the link provided below.
+ca.index.CALocked = But, the CA is locked. Unlock the CA to access CA functions.
+ca.index.CANotInitialized = CA is not running or the CA may not have been initialized. Initialize the CA using the link provided below.
ca.index.publishCACert = Publish CA Certificate
ca.index.requestsToBeFulfilled = Requests to be fulfilled
ca.index.requestsToBeVerified = Requests to be verified
@@ -140,32 +140,32 @@
ca.listRequestsVerify.certRequestsAwaitingVerify = Certificate Requests awaiting verification
ca.listRequestsVerify.certRequestsAwaitingVerifyExp = This screen shows the certificate requests waiting for verification.
ca.processCSR.pastePkcs10here = ...paste pkcs10 encoded certificate request here...
-ca.processCSR.summary = This screen lets you process Certificate Signing Request (CSR) text and view the details of the requestor. Paste the content of CSR text file you received from the requestor and click on<i>Process CSR</i> button. The next screen will show the details of the requestor and allow you to input information required to issue a certificate.
+ca.processCSR.summary = This screen lets you process Certificate Signing Request (CSR) text and view the details of the requestor. Paste the content of CSR text file you received from the requestor and click the <i>Process CSR</i> button. The next screen will show the details of the requestor and allow you to input information required to issue a certificate.
ca.processCSR.title = <b>Issue New Certificate</b> - Step 1: Process Certificate Signing Request (CSR)
ca.setupCA.summary = On this screen you can enter the Certification Authority (CA) details, algorithm parameters for CA's keypair, algorithm for CA's self signed certificate and a password to protect the CA's private key. The next screen will let you review this information before generating the CA's keypair and self-signed certificate.
ca.setupCA.title = <b>Setup Certification Authority</b> - Step 1: Enter CA details
ca.unlockCA.enterCAPrivateKeyPassword = Enter the CA's private key password
ca.unlockCA.summary = This screen lets you unlock the CA by providing the password used to protect the CA's private key. Once unlocked, the CA functions will be available.
ca.viewCertificate.backToRequest = Back to Requests to be fulfilled
-ca.viewCertificate.enterSerialNumber = Enter the serial number of the certificate to be viewed and click on <i>View Certificate</i> button.
+ca.viewCertificate.enterSerialNumber = Enter the serial number of the certificate to be viewed and click the <i>View Certificate</i> button.
ca.viewCertificate.screenShows = This screen shows the details of a certificate issued by the CA. The base64 encoded certificate text should be sent to the requestor as a reply to their Certificate Signing Request (CSR).
configmanager.help.stopStart = Stop/Start
-configmanager.help.stopStartExp = The stop/start toggle can be clicked to stop or start an application. If the toggle says "Stop" the application is running so clicking on the Stop toggle will stop the application and vice versa.
+configmanager.help.stopStartExp = The stop/start toggle can be clicked to stop or start an application. If the toggle says "Stop" the application is running. So clicking the Stop toggle will stop the application and vice versa.
configmanager.help.title = This page lists the applications that have been installed in the server and whether they are running or stopped. There are four columns; two provide information and the other two allow user action. The first column indicates the state of the application, either "stopped" or "running." The fourth column shows the configID of the application. The two remaining columns are:
configmanager.help.uninstallExp = The uninstall link will undeploy/remove the application from Geronimo.
configmanager.normal.cancel = Cancel
configmanager.normal.childComponents = Child Components
configmanager.normal.componentName = Component Name
-configmanager.normal.confirmMsg01 = \ is an Apache Geronimo service. Stopping this component may prevent the server or the administration console from functioning properly. All dependent components and subsequent dependencies will also be stopped. Reference the "Child Components" list in the view for directly affected components. Proceed with this action?
+configmanager.normal.confirmMsg01 = \ is an Apache Geronimo service. Stopping this component can prevent the server or the administration console from functioning properly. All dependent components and subsequent dependencies will also be stopped. See the "Child Components" list in the view for directly affected components. Proceed with this action?
configmanager.normal.confirmMsg02 = \ provides the administration console interface that you are currently viewing. Stopping it will cause the interface to become unavailable and manual action will be required to restore the function. Proceed with this action?
-configmanager.normal.confirmMsg03 = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). All dependent components and subsequent dependencies will also be stopped. Proceed with this action?
-configmanager.normal.confirmMsg04 = \ is an Apache Geronimo service. Restarting this component may prevent the server or the administration console from functioning properly. As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Only this component will be restarted. Reference the "Child Components" list in the view for directly affected components. Proceed with this action?
+configmanager.normal.confirmMsg03 = \ is provided by Apache Geronimo and may be required by other modules (see the "Child Components" listed in the view). All dependent components and subsequent dependencies will also be stopped. Proceed with this action?
+configmanager.normal.confirmMsg04 = \ is an Apache Geronimo service. Restarting this component may prevent the server or the administration console from functioning properly. As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Only this component will be restarted. See the "Child Components" list in the view for directly affected components. Proceed with this action?
configmanager.normal.confirmMsg05 = \ provides the administration console interface that you are currently viewing. Restarting it will cause the interface to become unavailable and manual action may be necessary to restore the console function. Proceed with this action?
-configmanager.normal.confirmMsg06 = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Proceed with this action?
-configmanager.normal.confirmMsg07 = \ is an Apache Geronimo service. Uninstalling this component may have unexpected results such as rendering the administration web console or even the server itself unstable. Reference the "Child Components" view for directly affected components. Are you certain you wish to proceed with this uninstall?
+configmanager.normal.confirmMsg06 = \ is provided by Apache Geronimo and may be required by other modules (see the "Child Components" listed in the view). As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Proceed with this action?
+configmanager.normal.confirmMsg07 = \ is an Apache Geronimo service. Uninstalling this component might have unexpected results such as rendering the administration web console or even the server itself unstable. See the "Child Components" view for directly affected components. Are you certain you wish to proceed with this uninstall?
configmanager.normal.confirmMsg08 = \ provides the administration console user interface that you are currently viewing. Uninstalling it will cause the interface to become unavailable and manual action will be required to restore the function. Are you certain you wish to proceed with this uninstall?
-configmanager.normal.confirmMsg09 = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). Are you certain you wish to proceed with this uninstall?
+configmanager.normal.confirmMsg09 = \ is provided by Apache Geronimo and might be required by other modules (see the "Child Components" listed in the view). Are you certain you wish to proceed with this uninstall?
configmanager.normal.confirmMsg10 = Are you certain you wish to uninstall
configmanager.normal.displayName = Display Name
configmanager.normal.expertMode = Expert User (enable all actions on Geronimo Provided Components)
@@ -203,6 +203,7 @@
consolebase.common.next = Next
consolebase.common.password = Password
consolebase.common.refresh = Refresh
+consolebase.common.remove = Remove
consolebase.common.reset = Reset
consolebase.common.restart = Restart
consolebase.common.return = Return
@@ -308,9 +309,9 @@
keystore.confirmCertificate.certificateDetails = Certificate Details
keystore.confirmCertificate.fingerprint = Fingerprint
keystore.confirmCertificate.importCertificate = Import Certificate
-keystore.confirmCertificate.title = Please confirm that this is the correct certificate to import:
+keystore.confirmCertificate.title = Confirm that this is the correct certificate to import:
keystore.confirmKey.generateKey = Generate Key
-keystore.confirmKey.title = Please confirm that this is the correct information for the key I'm about to generate:
+keystore.confirmKey.title = Confirm that this is the correct information for the key I'm about to generate:
keystore.createKeystore.createKeystore = Create Keystore
keystore.createKeystore.keystoreFileName = Keystore file name
keystore.createKeystore.passwordForKeystore = Password for new keystore
@@ -331,7 +332,7 @@
keystore.index.title = This tool walks you through the process of configuring keystores to use with SSL connectors (for the web container, etc.).
keystore.index.type = Type
keystore.index.unlocked = Unlocked
-keystore.unlockKey.title = The keystore has been unlocked. However, a private key within the keystore also needs to be unlocked in order for SSL to work properly. Please specify the password for the private key within the keystore.
+keystore.unlockKey.title = The keystore has been unlocked. However, a private key within the keystore also needs to be unlocked in order for SSL to work properly. Specify the password for the private key within the keystore.
keystore.unlockKey.unlockPrivateKey = Unlock Private Key
keystore.unlockKeystore.enterKeystorePassword = Enter keystore password
keystore.uploadCertificate.aliasForCertificate = Alias for certificate
@@ -357,9 +358,9 @@
logmanager.help.configFileExplanation = Another configuration file can be used by entering a different path and file name in the Config file text box.
logmanager.help.introduction = <p>This portlet allows the user to temporarily select a configuration file for logging and/or change the log level and Refresh period. The default "Config file" is a standard log4j file and defines the location where the Geronimo Server will log Geronimo output. The configuration file also defines the log level, the maximum log file size, and other attributes associated with logging. <br> <br> Gereonimo Console will display output from the Geronimo log file in the Server Log Viewer portlet in the next window pane.</p>
logmanager.help.logLevelExplanation = The user may select a level for logging from the drop-down menu.
-logmanager.help.refreshPeriodExplanation = By default Geronimo checks every 60 seconds to see if the configuration file has changed. The user may modify the refresh period.
+logmanager.help.refreshPeriodExplanation = By default Geronimo checks every 60 seconds to see whether the configuration file has changed. The user may modify the refresh period.
logmanager.help.resetExplanation = Resets the "Config File", "Refresh Period" and "Log Level" to their settings at the last "Update." It does not reset to the Geronimo Server defaults.
-logmanager.help.updateExplanation = Make changes take effect until next server restart.
+logmanager.help.updateExplanation = Make changes take effect until next server restarts.
logmanager.search.containingText = Containing text
logmanager.search.fileterLog = Filter Log
logmanager.search.go = Go
@@ -372,15 +373,15 @@
logmanager.search.to = To
logmanager.search.withExceptions = With Exceptions
logmanager.viewhelp.filterResults = Filter results
-logmanager.viewhelp.filterResultsExplanationFrag1 = Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser may limit how many lines can be displayed at once.
+logmanager.viewhelp.filterResultsExplanationFrag1 = Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser might limit how many lines can be displayed at once.
logmanager.viewhelp.filterResultsExplanationFrag2 = The user may filter on the log level to display only log lines at that level.
logmanager.viewhelp.filterResultsExplanationFrag3 = The user may also enter a string of text to search for.
logmanager.viewhelp.introduction = This portlet displays the Geronimo server log and is helpful for debugging problems with the Geronimo Console and with deployed applications.
logmanager.viewhelp.refreshExplanation = Resets the filtering criteria to Geronimo Console's defaults and displays the latest 11 lines in the Geronimo log file.
-repository.help.addDependencyElement = To use an artifact in an application, add a dependency element into it's deployment plan. For example, to use Castor XML add the following XML to the plan:
+repository.help.addDependencyElement = To use an artifact in an application, add a dependency element into its deployment plan. For example, to use Castor XML add the following XML to the plan:
repository.help.browseExplanation = Browse to select the artifact to be added.
-repository.help.installExplanation = Click on this button to install the artifact.
+repository.help.installExplanation = Click this button to install the artifact.
repository.help.title = This page displays the artifacts installed in the server's repository. The layout of the repository is the same as that used by Apache Maven making it possible to easily copy files over. The Geronimo Console provides a method for adding artifacts:
repository.normal.addArchiveToRepository = Add Archive to Repository
repository.normal.artifact = Artifact
@@ -390,7 +391,7 @@
repository.normal.replacedName = Replaced component name
repository.normal.replacedNameDescription = Specify an existing component name to be replaced during runtime, the component name should be like groupId/artifactId/Version/Type. Otherwise, leave the field blank.
repository.normal.title = Add Archive to Repository
-repository.normal.toViewUsage = Click on an entry to view usage.
+repository.normal.toViewUsage = Click an entry to view usage.
repository.usage.content = To use <b>{0}</b> in an application or a module, add a dependency element under dependencies in environment element in it's deployment plan as shown below:
repository.usage.title = Usage for {0}
@@ -406,29 +407,29 @@
securityrealmmanager.derby.groups.help.addNewGroupBtnExp = Clicking this button will create the new group. If users had been put in the new group, clicking "Add" will create the new group with the selected users in it.
securityrealmmanager.derby.groups.help.cancelUserBtnExp = Will cancel the creation of the new group and return the previous page to the browser.
securityrealmmanager.derby.groups.help.descriptionExp = The description of the group.
-securityrealmmanager.derby.groups.help.title = This portlet lists all the Application Realm groups and allows the user to add, modify and delete them. To add a new group click on the "Create New Group" link and fill in the fields on that page. To modify an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the "Delete" link to the right of the group to be deleted. <br> <br> Clicking on the "Create New Group" link allows creation of a new group by filling in the fields and clicking on the "Add" button.
-securityrealmmanager.derby.groups.help.usersExp = The box on the left lists all the current user accounts. Selecting a user and then clicking the "Add>>" button will put the user in the group. Selecting a user in the list to the right and clicking on the "<<Remove" button will delete the user from the group.
+securityrealmmanager.derby.groups.help.title = This portlet lists all the Application Realm groups and allows the user to add, modify and delete them. To add a new group click the "Create New Group" link and fill in the fields on that page. To modify an existing group, click the group link and change the field(s) on the page. To delete a group, click the "Delete" link to the right of the group to be deleted. <br> <br> Clicking the "Create New Group" link allows creation of a new group by filling in the fields and clicking on the "Add" button.
+securityrealmmanager.derby.groups.help.usersExp = The box on the left lists all the current user accounts. To put the user in the group, select a user and then click the "Add>>" button. To delete the user from the group, select a user in the list to the right and click the "<<Remove" button.
securityrealmmanager.derby.groups.maximized.createNewGroup = Create New Group
securityrealmmanager.derby.users.addmaximized.addUser = ADD USER
securityrealmmanager.derby.users.addmaximized.updateUser = UPDATE USER
-securityrealmmanager.derby.users.help.addUserBtnExp = To add the new user click the "Add" button.
-securityrealmmanager.derby.users.help.cancelUserBtnExp = To cancel an add this button must be clicked before the "Add" button.
+securityrealmmanager.derby.users.help.addUserBtnExp = To add the new user, click the "Add" button.
+securityrealmmanager.derby.users.help.cancelUserBtnExp = To cancel an added user, click this button before the "Add" button.
securityrealmmanager.derby.users.help.confirmPasswordExp = Re-enter the new user's password.
-securityrealmmanager.derby.users.help.createUserBtnExp = Click on this button to create the new user and return to the main "Console Realm Users" page. The new user will be listed there.
+securityrealmmanager.derby.users.help.createUserBtnExp = Click this button to create the new user and return to the main "Console Realm Users" page. The new user will be listed there.
securityrealmmanager.derby.users.help.departmentExp = The user's department.
securityrealmmanager.derby.users.help.emailExp = The user's email address.
securityrealmmanager.derby.users.help.familyNameExp = The user's last name.
securityrealmmanager.derby.users.help.givenNameExp = The user's first name.
securityrealmmanager.derby.users.help.passwordExp = Password for the new user.
-securityrealmmanager.derby.users.help.title = This page lists all the application realm users and allows you to add, modify and delete them. To add a new user click on the "Create New User" link and fill in the fields on that page. To modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the "Delete" link to the right of the user to be deleted. <br> <br> Clicking on the "Create New User" link allows adding users by filling in the fields and clicking on the "Add" button. The fields are defined as follows:
+securityrealmmanager.derby.users.help.title = This page lists all the application realm users and allows you to add, modify and delete them. To add a new user, click the "Create New User" link and fill in the fields on that page. To modify a user's account, click the username link for the user and change the field(s) on the page. To delete a user, click the "Delete" link to the right of the user to be deleted. <br> <br> Clicking the "Create New User" link allows adding users by filling in the fields and clicking the "Add" button. The fields are defined as follows:
securityrealmmanager.derby.users.help.usernameExp = The username for the user.
securityrealmmanager.derby.users.maximized.createNewUser = Create New User
securityrealmmanager.se.groups.addmaximized.addGroup = ADD GROUP
securityrealmmanager.se.groups.addmaximized.updateGroup = UPDATE GROUP
securityrealmmanager.se.groups.help.addNewGroupBtnExp = Clicking this button will create the new group. If users had been put in the new group, clicking "Add" will create the new group with the selected users in it.
securityrealmmanager.se.groups.help.cancelNewGroupBtnExp = Cancel the current operation.
-securityrealmmanager.se.groups.help.title = This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new group click on the "Create New Group" link and fill in the fields on that page. To modify an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the "Delete" link to the right of the group to be deleted. <br> <br>Clicking on the "Create New Group" link allows the user to add a new group. The fields are defined as follows:
-securityrealmmanager.se.groups.help.usersExp = The box on the left lists all the current user accounts. Selecting a user and then clicking the "Add>>" button will put the user in the group. Selecting a user in the list to the right and clicking on the "<<Remove" button will delete the user from the group.
+securityrealmmanager.se.groups.help.title = This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new, click the "Create New Group" link and fill in the fields on that page. To modify an existing group, click the group link and change the field(s) on the page. To delete a group, click the "Delete" link to the right of the group to be deleted. <br> <br>Clicking on the "Create New Group" link allows the user to add a new group. The fields are defined as follows:
+securityrealmmanager.se.groups.help.usersExp = The box on the left lists all the current user accounts. To put the user in the group, select a user and then click the "Add>>" button. To delete the user from the group, select a user in the list to the right and click the "<<Remove" button.
securityrealmmanager.se.groups.maximized.createNewGroup = Create New Group
securityrealmmanager.se.groups.maximized.createNewUser = Create New User
securityrealmmanager.se.groups.maximized.noUsers = No available users.
@@ -440,13 +441,13 @@
securityrealmmanager.se.users.help.confirmPasswordExp = Re-enter the new user's password.
securityrealmmanager.se.users.help.createUserBtnExp = Click on this button to create the new user and return to the main "Console Realm Users" page. The new user will be listed there.
securityrealmmanager.se.users.help.passwordExp = Password for the new user.
-securityrealmmanager.se.users.help.title = This portlet lists all the console realm users and allows the user to add, modify and delete them. To add a new user click on the "Create New User" link and fill in the fields on that page. To modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the "Delete" link to the right of the user to be deleted.<br> <br> Clicking on the Create New User link brings up a page that allows adding users by filling in the fields and clicking on the"Add" button. The fields are defined as follows:
+securityrealmmanager.se.users.help.title = This portlet lists all the console realm users and allows the user to add, modify and delete them. To add a new user click the "Create New User" link and fill in the fields on that page. To modify a user's account, click the username link for the user and change the field(s) on the page. To delete a user, click the "Delete" link to the right of the user to be deleted.<br> <br> Clicking the Create New User link brings up a page that allows adding users by filling in the fields and clicking on the"Add" button. The fields are defined as follows:
securityrealmmanager.se.users.help.usernameExp = The username for the user.
securityrealmmanager.se.users.maximized.createNewUser = Create New User
servermanager.help.shutdownHelpBody = <p>This portlet give the admin the ability to remotely shutdown the Geronimo server.</p><p>A shutdown will shutdown the server and cause the JVM to exit. To continue using the Geronimo Console after a shutdown, Geronimo must be restarted.</p>
servermanager.normal.cancel = Cancel
-servermanager.normal.comfirmMsg01 = Are you sure you want to shutdown the server (last chance)?
+servermanager.normal.comfirmMsg01 = Are you sure that you want to shutdown the server (last chance)?
servermanager.normal.ok = OK
servermanager.normal.proceedOnlyIf = Proceed only if you are certain you want to terminate the server.
servermanager.normal.shutdown = Shutdown
@@ -508,10 +509,10 @@
webmanager.common.bufferSize = BufferSize
webmanager.common.bufferSizeExp = The size (in bytes) of the buffer to be provided for input streams created by this connector. By default, buffers of 2048 bytes will be provided.
webmanager.common.ciphers = Ciphers
-webmanager.common.ciphersExp = A comma separated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
+webmanager.common.ciphersExp = A comma-separated list of the encryption ciphers that may be used. If not specified, any available cipher may be used.
webmanager.common.clientAuthRequired = Client Auth Required
webmanager.common.compressableMimeType = CompressableMimeType
-webmanager.common.compressableMimeTypeExp = The value is a comma separated list of MIME types for which HTTP compression may be used. The default value is text/html,text/xml,text/plain.
+webmanager.common.compressableMimeTypeExp = The value is a comma-separated list of MIME types for which HTTP compression may be used. The default value is text/html,text/xml,text/plain.
webmanager.common.compression = Compression
webmanager.common.compressionExp = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is "off" (disable compression), "on" (allow compression, which causes text data to be compressed), "force" (forces compression in all cases), or a numerical integer value (which is equivalent to "on", but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to "on" or more aggressive, the output will also be compressed. If not specified, this attribute is set to "off".
webmanager.common.confirmPassword = Confirm Password
@@ -525,7 +526,7 @@
webmanager.common.emptySessionPathExp = If checked, all paths for session cookies will be set to /.
webmanager.common.emptyText = The focussed field must not be empty.
webmanager.common.enableLookups = EnableLookups
-webmanager.common.enableLookupsExp = Check if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client. By default, DNS lookups are enabled.
+webmanager.common.enableLookupsExp = Check whether you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client. By default, DNS lookups are enabled.
webmanager.common.fields = fields
webmanager.common.host = Host
webmanager.common.hostExp = The host name or IP to bind to. The normal values are <tt>0.0.0.0</tt> (all interfaces) or <tt>localhost</tt> (local connections only)
@@ -551,11 +552,11 @@
webmanager.common.maxThreads = Max Threads
webmanager.common.maxThreadsExp = The maximum number of threads this connector should use to handle incoming requests
webmanager.common.minSpareThreads = MinSpareThreads
-webmanager.common.minSpareThreadsExp = The number of request processing threads that will be created when this Connector is first started. The connector will also make sure it has the specified number of idle processing threads available. This attribute should be set to a value smaller than that set for maxThreads. The default value is 4.
+webmanager.common.minSpareThreadsExp = The number of request processing threads that will be created when this Connector is first started. The connector will also make sure that it has the specified number of idle processing threads available. This attribute should be set to a value smaller than that set for maxThreads. The default value is 4.
webmanager.common.minThreads = Min Threads
webmanager.common.minThreadsExp = The minimum number of threads this connector should use to handle incoming requests
webmanager.common.noCompressionUserAgents = NoCompressionUserAgents
-webmanager.common.noCompressionUserAgentsExp = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation. The default value is an empty String (regexp matching disabled).
+webmanager.common.noCompressionUserAgentsExp = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation. The default value is an empty String (regexp matching disabled).
webmanager.common.port = Port
webmanager.common.portExp = The network port to bind to.
webmanager.common.protocol = Protocol
@@ -566,7 +567,7 @@
webmanager.common.redirectPort = RedirectPort
webmanager.common.redirectPortExp = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
webmanager.common.restrictedUserAgents = RestrictedUserAgents
-webmanager.common.restrictedUserAgentsExp = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. The default value is an empty String (regexp matching disabled).
+webmanager.common.restrictedUserAgentsExp = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. The default value is an empty String (regexp matching disabled).
webmanager.common.server = Server
webmanager.common.serverExp = The Server header for the http response. Unless your paranoid, you won't need this feature. (No offense. The description is taken from Tomcat documentation.)
webmanager.common.show = Show
@@ -586,7 +587,7 @@
webmanager.common.truststorePassword = Truststore Password
webmanager.common.truststoreType = Truststore Type
webmanager.common.uniqueName = Unique Name
-webmanager.common.uniqueNameExp = A name that is different than the name for any other web connectors in the server (no spaces in the name please)
+webmanager.common.uniqueNameExp = A name that is different from the name for any other web connectors in the server (no spaces in the name please)
webmanager.common.uriEncoding = URIEncoding
webmanager.common.uriEncodingExp = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL. Default is ISO-8859-1.
webmanager.common.useBodyEncodingForURI = UseBodyEncodingForURI
@@ -602,7 +603,7 @@
webmanager.connector.editConnector.JettyManagerImpl.38 = The maximum unaccepted connections to queue if no threads are available.
webmanager.connector.editConnector.JettyManagerImpl.40 = The maximum time in seconds that a connection lingers during close handshaking.
webmanager.connector.editConnector.JettyManagerImpl.42 = Port to redirect to for confidential connections. 0 if not supported.
-webmanager.connector.editConnector.JettyManagerImpl.44 = If set, then clients connecting through this connector must supply a valid client certificate.
+webmanager.connector.editConnector.JettyManagerImpl.44 = If set, clients connecting through this connector must supply a valid client certificate.
webmanager.connector.editConnector.JettyManagerImpl.47 = The keystore to use for accessing the server's private key
webmanager.connector.editConnector.JettyManagerImpl.50 = The keystore containing the trusted certificate entries, including Certification Authority (CA) certificates
webmanager.connector.editConnector.JettyManagerImpl.53 = This should normally be set to TLS, though some (IBM) JVMs don't work properly with popular browsers unless it is changed to SSL.
@@ -614,7 +615,7 @@
webmanager.connector.editConnector.TomcatManagerImpl.108 = The host name or IP to bind to. The normal values are 0.0.0.0 (all interfaces) or localhost (local connections only).
webmanager.connector.editConnector.TomcatManagerImpl.11 = Protocol which may be used for communicating with clients.
webmanager.connector.editConnector.TomcatManagerImpl.110 = The size (in bytes) of the buffer to be provided for input streams created by this connector.
-webmanager.connector.editConnector.TomcatManagerImpl.113 = The value is a comma separated list of MIME types for which HTTP compression may be used.
+webmanager.connector.editConnector.TomcatManagerImpl.113 = The value is a comma-separated list of MIME types for which HTTP compression may be used.
webmanager.connector.editConnector.TomcatManagerImpl.116 = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is <i>off</i> (disable compression), <i>on</i> (allow compression, which causes text data to be compressed), <i>force</i> (forces compression in all cases), or a numerical integer value (which is equivalent to <i>on</i>, but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to <i>on</i> or more aggressive, the output will also be compressed.
webmanager.connector.editConnector.TomcatManagerImpl.118 = The number of milliseconds during which the sockets used by this Connector will linger when they are closed. The default value is -1 (socket linger is disabled).
webmanager.connector.editConnector.TomcatManagerImpl.120 = The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be presented.
@@ -626,10 +627,10 @@
webmanager.connector.editConnector.TomcatManagerImpl.132 = The maximum number of request processing threads to be created by this Connector, which therefore determines the maximum number of simultaneous requests that can be handled. If not specified, this attribute is set to 40. If an executor is associated with this connector, this attribute is ignored as the connector will execute tasks using the executor rather than an internal thread pool.
webmanager.connector.editConnector.TomcatManagerImpl.134 = Minimum spare threads
webmanager.connector.editConnector.TomcatManagerImpl.136 = Maximum spare threads
-webmanager.connector.editConnector.TomcatManagerImpl.139 = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation.
+webmanager.connector.editConnector.TomcatManagerImpl.139 = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation.
webmanager.connector.editConnector.TomcatManagerImpl.14 = Ciphers which may be used for communicating with clients.
webmanager.connector.editConnector.TomcatManagerImpl.141 = The TCP port number on which this Connector will create a server socket and await incoming connections. Your operating system will allow only one server application to listen to a particular port number on a particular IP address.
-webmanager.connector.editConnector.TomcatManagerImpl.144 = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features.
+webmanager.connector.editConnector.TomcatManagerImpl.144 = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features.
webmanager.connector.editConnector.TomcatManagerImpl.147 = The Server header for the http response.
webmanager.connector.editConnector.TomcatManagerImpl.149 = The size (in bytes) of the buffer to be provided for socket output buffering. -1 can be specified to disable the use of a buffer.
webmanager.connector.editConnector.TomcatManagerImpl.151 = If set to true, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances.
@@ -644,13 +645,13 @@
webmanager.connector.editConnector.TomcatManagerImpl.169 = When turning SSLEnabled value to true you will want to set the scheme attribute as well to pass the correct request.getScheme() to the servlets
webmanager.connector.editConnector.TomcatManagerImpl.170 = When turning SSLEnabled value to true you will want to set the secure attribute as well to pass the correct request.isSecure() values to the servlets
webmanager.connector.editConnector.TomcatManagerImpl.17 = Name of the file that contains the server certificate. The format is PEM-encoded.
-webmanager.connector.editConnector.TomcatManagerImpl.171 = A comma separated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
-webmanager.connector.editConnector.TomcatManagerImpl.173 = The alias used to for the server certificate in the keystore. If not specified the first key read in the keystore will be used.
+webmanager.connector.editConnector.TomcatManagerImpl.171 = A comma-separated list of the encryption ciphers that may be used. If not specified, any available cipher may be used.
+webmanager.connector.editConnector.TomcatManagerImpl.173 = The alias used to for the server certificate in the keystore. If not specified, the first key read in the keystore will be used.
webmanager.connector.editConnector.TomcatManagerImpl.175 = The TrustStore file to use to validate client certificates.
webmanager.connector.editConnector.TomcatManagerImpl.177 = The password to access the TrustStore.
webmanager.connector.editConnector.TomcatManagerImpl.179 = Set the truststore type. There is normally no reason not to use the default (JKS).
webmanager.connector.editConnector.TomcatManagerImpl.181 = Use this attribute to enable or disable sendfile capability.
-webmanager.connector.editConnector.TomcatManagerImpl.183 = Set to true to use the NIO thread pool executor. The default value is true. If set to false, it uses a thread pool based on a stack for its execution. Generally, using the executor yields a little bit slower performance, but yields a better fairness for processing connections in a high load environment as the traffic gets queued through a FIFO queue. If set to true(default) then the max pool size is the maxThreads attribute and the core pool size is the minSpareThreads. This value is ignored if the executor attribute is present and points to a valid shared thread pool.
+webmanager.connector.editConnector.TomcatManagerImpl.183 = Set to true to use the NIO thread pool executor. The default value is true. If set to false, it uses a thread pool based on a stack for its execution. Generally, using the executor yields a little bit slower performance, but yields a better fairness for processing connections in a high load environment as the traffic gets queued through a FIFO queue. If set to true(default), the max pool size is the maxThreads attribute and the core pool size is the minSpareThreads. This value is ignored if the executor attribute is present and points to a valid shared thread pool.
webmanager.connector.editConnector.TomcatManagerImpl.185 = The number of threads to be used to accept connections. Increase this value on a multi-CPU machine, although you would never really need more than 2. Also, with a lot of non-keep-alive connections, you might want to increase this value as well.
webmanager.connector.editConnector.TomcatManagerImpl.187 = The number of threads to be used to run for the polling events.
webmanager.connector.editConnector.TomcatManagerImpl.189 = The priority of the poller threads.
@@ -685,7 +686,7 @@
webmanager.connector.editConnector.TomcatManagerImpl.241 = The max selectors to be used in the pool, to reduce selector contention. Use this option when the command line org.apache.tomcat.util.net.NioSelectorShared value is set to false.
webmanager.connector.editConnector.TomcatManagerImpl.243 = The max spare selectors to be used in the pool, to reduce selector contention. When a selector is returned to the pool, the system can decide to keep it or let it be GC:ed. Use this option when the command line org.apache.tomcat.util.net.NioSelectorShared value is set to false.
webmanager.connector.editConnector.TomcatManagerImpl.245 = The following command line options are available for the NIO connector: <br><i>-Dorg.apache.tomcat.util.net.NioSelectorShared=true|false</i>. Set this value to false if you wish to use a selector for each thread. the property. If you do set it to false, you can control the size of the pool of selectors by using the selectorPool.maxSelectors attribute
-webmanager.connector.editConnector.TomcatManagerImpl.247 = The NIO connector implements an OutOfMemoryError strategy called parachute. It holds a chunk of data as a byte array. In case of an OOM, this chunk of data is released and the error is reported. This will give the VM enough room to clean up. The oomParachute represent the size in bytes of the parachute(the byte array). The default value is 1024*1024(1MB). Please note, this only works for OOM errors regarding the Java Heap space, and there is absolutely no guarantee that you will be able to recover at all. If you have an OOM outside of the Java Heap, then this parachute trick will not help.
+webmanager.connector.editConnector.TomcatManagerImpl.247 = The NIO connector implements an OutOfMemoryError strategy called parachute. It holds a chunk of data as a byte array. In case of an OOM, this chunk of data is released and the error is reported. This will give the VM enough room to clean up. The oomParachute represent the size in bytes of the parachute(the byte array). The default value is 1024*1024(1MB). Note, this only works for OOM errors regarding the Java Heap space, and there is absolutely no guarantee that you will be able to recover at all. If you have an OOM outside of the Java Heap, this parachute trick will not help.
webmanager.connector.editConnector.TomcatManagerImpl.249 = Duration of a poll call. Lowering this value will slightly decrease latency of connections being kept alive in some cases, but will use more CPU as more poll calls are being made.
webmanager.connector.editConnector.TomcatManagerImpl.251 = Amount of sockets that the poller responsible for polling kept alive connections can hold at a given time. Extra connections will be closed right away.
webmanager.connector.editConnector.TomcatManagerImpl.253 = Use kernel level sendfile for certain static files.
@@ -716,7 +717,7 @@
webmanager.connector.editConnector.TomcatManagerImpl.92 = If this Connector is being used in a proxy configuration, configure this attribute to specify the server port to be returned for calls to request.getServerPort().
webmanager.connector.editConnector.TomcatManagerImpl.94 = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
webmanager.connector.editConnector.TomcatManagerImpl.97 = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL.
-webmanager.connector.editConnector.TomcatManagerImpl.99 = This specifies if the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x, where the encoding specified in the contentType, or explicitly set using Request.setCharacterEncoding method was also used for the parameters from the URL.
+webmanager.connector.editConnector.TomcatManagerImpl.99 = This specifies whether the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x, where the encoding specified in the contentType, or explicitly set using Request.setCharacterEncoding method was also used for the parameters from the URL.
webmanager.connector.editConnector.addNew = Add a new
webmanager.connector.editConnector.attribute = Attribute
webmanager.connector.editConnector.desc = Description
@@ -738,7 +739,7 @@
webmanager.help.disableExplanation = Turn off statistics gathering and return the user to the main page.
webmanager.help.refreshExplanation = Update the display with the latest statistics.
webmanager.help.resetExplanation = Reset all counts, totals, averages, etc., to 0 and start gathering statistics again.
-webmanager.help.title = Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click on the enable link to monitor the performance of the Geronimo server.
+webmanager.help.title = Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click the enable link to monitor the performance of the Geronimo server.
webmanager.normal.activeRequestCount = Active Request Count
webmanager.normal.avgTime = Avg Time (ms)
webmanager.normal.connectionDuration = Connection Duration
@@ -764,9 +765,9 @@
webmanager.normal.totalTime = Total Time
welcome.welcomeMaximized.fragment1 = The welcome portlet is the first page that users see when they log in to the Administrative Console. It contains introductory information about the Administrative Console.
-welcome.welcomeMaximized.fragment2 = To return to the main Welcome panel select the "view" link from the header of this portlet.
+welcome.welcomeMaximized.fragment2 = To return to the main Welcome panel, select the "view" link from the header of this portlet.
welcome.welcomeMaximized.title = Welcome to the Apache Geronimo™ Administration Console!
-welcome.welcomeNormal.about1 = The administration console provides a convenient, user friendly way to administer many aspects of the Geronimo Server. It is currently a work in progress, and will continue to evolve over time. The navigation panel on the left-hand side of the screen provides easy access to the individual tasks available in the console.
+welcome.welcomeNormal.about1 = The administration console provides a convenient way to administer many aspects of the Geronimo Server. It is currently a work in progress, and will continue to evolve over time. The navigation panel on the left-hand side of the screen provides easy access to the individual tasks available in the console.
welcome.welcomeNormal.about2 = This space is the main content area where the real work happens. Each view contains one or more portlets (self contained view fragments) that typically include a link for help in the header. Look at the top of this portlet for an example and try it out.
welcome.welcomeNormal.about3 = The references on the right are provided so that you can learn more about Apache Geronimo, its capabilities, and what might be coming in future releases.
welcome.welcomeNormal.about4 = Mailing lists are available to get involved in the development of Apache Geronimo or to ask questions of the community:
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:23:55 2009
@@ -26,7 +26,6 @@
Applications = Applications
Artifact-Aliases = Artifact-Aliases
-
Certificate\ Authority = Certificate Authority
Certification\ Authority = Certification Authority
@@ -58,7 +57,6 @@
Installed\ Web\ Applications = Installed Web Applications
J2EE\ Connectors = J2EE Connectors
-
JAR\ Aliases = JAR Aliases
Java\ System\ Info = Java System Info
@@ -134,7 +132,7 @@
consolebase.errorMsg21 = Unable to get next serial number from CA.
consolebase.errorMsg22 = Errors in user input while processing a CSR.
consolebase.errorMsg23 = Errors encountered while issuing certificate.
-consolebase.errorMsg24 = Default properties-login module does not exist, it may be replaced by a customized login module.
+consolebase.errorMsg24 = Default properties-login module does not exist, it might be replaced by a customized login module.
consolebase.infoMsg01 = Started application
consolebase.infoMsg02 = Stopped application
consolebase.infoMsg03 = Restarted application
@@ -158,6 +156,6 @@
consolebase.warnMsg03 = Web statistics are not supported for the current web container.
consolebase.warnMsg04 = Statistics are not currently being collected.
consolebase.warnMsg05 = CA is not running or CA may not have been initialized. Unable to lock CA.
-consolebase.warnMsg06 = A certificate with the serial number <b>{0}</b> has already been issued. You may be seeing this message since you have clicked on 'Issue Certificate' button a second time.
+consolebase.warnMsg06 = A certificate with the serial number <b>{0}</b> has already been issued. You might be seeing this message since you have clicked 'Issue Certificate' button a second time.
consolebase.warnMsg07 = <p style='font-size:120%;'><b>A shutdown of the server will disable this Web Console! Proceed only if you are certain you want to terminate the server.</b></p>
consolebase.warnMsg08 = There are no Web Containers defined.
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties Mon Dec 7 08:23:55 2009
@@ -23,4 +23,4 @@
tooltip.mode.help = Help
tooltip.mode.edit = Edit
-tooltip.css.classname = tooltip
\ No newline at end of file
+tooltip.css.classname = Tooltip
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties Mon Dec 7 08:23:55 2009
@@ -21,12 +21,12 @@
console.common.loginToConsole = Log in to the Geronimo Console
console.common.pages = Pages
console.common.password = Password
-console.common.username = Username
+console.common.username = User Name
console.head.title = Geronimo Console
console.login.components = <strong>Geronimo™</strong> has integrated the following components:<BR/> • Application server (Apache Geronimo)<br/> • Web server and servlet engine (Tomcat)<br/> • Web server and servlet engine (Jetty)<br/> • JSP compiler (Jasper)<br/> • JAX-RPC Web Services engine (Apache Axis)<br/> • JAX-WS Web Services engine (Apache Axis2)<br/> • JAX-WS Web Services engine (Apache CXF)<br/> • Relational database (Apache Derby)<br/> • Messaging (ActiveMQ)<br/> • User management services<br/> • Centralized administration console<br/>
console.login.introduction = <strong>GERONIMO™</strong> is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance.
-console.login.requireCookies = Note: Logging onto the Geronimo Console requires cookies to be enabled in your web browser.
+console.login.requireCookies = Note: To log in to the Geronimo Console, cookies must be enabled in your web browser.
console.login.welcome = Welcome to the Geronimo™ Console
-console.login_error.invalid = Invalid Username and/or Password!
+console.login_error.invalid = Invalid User Name and/or Password!
console.login_success.loginSuccessful = Login Successful
console.login_success.returnToPortalTests = Click here to return to the portal tests.
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp Mon Dec 7 08:23:55 2009
@@ -35,7 +35,7 @@
An assembly process has been developed to add these records to web.xml using Maven 2 (the
pluto:assemble goal in maven-pluto-plugin) or Ant (AssembleTask).
See the testsuite web.xml file for an example how the servlet and servlet-mapping
-records should look like after assembly (other items the developer adds to web.xml should be
+records should look like after assembly (other items that the developer adds to web.xml should be
carried forward into the updated file).
</p>
@@ -52,25 +52,29 @@
<div class="portlet-section-subheader">Deploying a Portlet Application</div>
<p class="portlet-font">
- The way to deploy a portlet application depends on the app server Pluto is running in. In the bundled distribution
- Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
- war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to
- the manager app in the bundled distribution (this link can be changed for other app servers -- see the
- adjacent Help link). In the bundled distribution of Pluto, you can also simply drop the portlet application war into Tomcat's
+ The way to deploy a portlet application depends on the app server that Pluto is running in. In the bundled distribution
+ Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
+ war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to
+ the manager app in the bundled distribution (this link can be changed for other app servers -- see the
+ adjacent Help link). In the bundled distribution of Pluto, you can also simply drop the portlet application war into Tomcat's
webapp directory.
</p>
<div class="portlet-section-subheader">Adding Portlets to a Portal Pages</div>
<p class="portlet-font">
-Adding portlets to a portal page using the Pluto Page Administrator portlet involves first selecting a portal
-page using the Portal Pages drop-down and then selecting a portlet application using the Portlet Applications
-drop-down and finally a portlet in the adjacent drop down. When this is done, click the Add Portlet button.
+To Add portlets to a portal page using the Pluto Page Administrator portlet, take the following steps:
+Select a portal page using the Portal Pages drop-down.
+Select a portlet application using the Portlet Applications drop-down
+Select a portlet in the adjacent drop down.
+Click the Add Portlet button.
</p>
<div class="portlet-section-subheader">Removing Portal Pages</div>
<p class="portlet-font">
-Removing portlets from a portal page involves selecting a portal page using the Portal Pages drop-down, selecting
-the portlet in the adjacent list and then clicking on the Remove Page button.
+To remove portlets from a portal page, take the following steps:
+Select a portal page using the Portal Pages drop-down.
+Select the portlet in the adjacent list.
+Click the Remove Page button.
</p>
@@ -99,10 +103,10 @@
<%-- Properties for link to app server deployer and help mode file --%>
<fmt:bundle basename="AdminPortlet">
- <fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
+ <fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
</fmt:bundle>
<portlet:renderURL portletMode="help" var="deployerhelpURL">
- <portlet-el:param name="helpPage" value="${deployerHelp}"/>
+ <portlet-el:param name="helpPage" value="${deployerHelp}"/>
</portlet:renderURL>
<p class="portlet-font">
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties?rev=887861&r1=887860&r2=887861&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
Mon Dec 7 08:23:55 2009
@@ -21,24 +21,24 @@
car.addRepository.currentlyPluginRepositories = The currently available plugin repositories
are
car.addRepository.downloadRunningCongfig = You can also download running configurations
from another Geronimo server just as if you're browsing and installing third-party plugins.
If you want to point to a remote Geronimo server, enter a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt>
car.addRepository.howToAddPluginRepositories = To add a new plugin repository to this list,
enter the URL to the repository. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository.
-car.addRepository.title = Add Plugin Repository
+car.addRepository.title = Add plugin repository
car.assemblyConfirm.description = Description
car.assemblyConfirm.moduleId = Module ID
car.assemblyConfirm.plugin = Plugin
car.assemblyConfirm.successful = Server Assembly Successful
-car.common.addRepository = Add Repository
+car.common.addRepository = Add repository
car.common.assemble = Assemble
car.common.author = Author
car.common.category = Category
-car.common.createGeronimoPlugin = Create Geronimo Plugin
+car.common.createGeronimoPlugin = Create Geronimo plugin
car.common.dependencies = Dependencies
-car.common.downloadRepositories = Download Repositories
-car.common.exportPlugin = Export Plugin
+car.common.downloadRepositories = Download repositories
+car.common.exportPlugin = Export plugin
car.common.geronimoVersions = Geronimo Versions
car.common.group = Group
car.common.license = License
car.common.moduleID = Module ID
-car.common.newRepository = New Repository
+car.common.newRepository = New repository
car.common.obsoletes = Obsoletes
car.common.openSource = Open Source
car.common.pluginURL = Plugin URL
@@ -53,38 +53,38 @@
car.common.prerequisite3Type = Prerequisite 3 Type
car.common.prerequisites = Prerequisites
car.common.proprietary = Proprietary
-car.common.removePlugins = Remove Geronimo Plugins
+car.common.removePlugins = Remove Geronimo plugins
car.common.repository = Repository
-car.common.savePluginData = Save Plugin Data
-car.common.searchForPlugins = Show Plugins in selected repository
+car.common.savePluginData = Save plugin Data
+car.common.searchForPlugins = Show plugins in selected repository
car.common.uniqueID = Unique ID
car.common.viewDetails = View Details
car.common.webSite = Web Site
-car.confirmExport.title = <b>Export Plugin</b> -- Save
to Disk
+car.confirmExport.title = <b>Export plugin</b> -- Save
to Disk
car.confirmExport.useBtnBelow = Use the button below to save the plugin "{0}"
to disk.
car.download.foundDependencies = Found the following dependencies for this
plugin. Any missing dependencies will be installed for you automatically if you proceed.
car.download.processing = Processing {0}...
car.downloadStatus.processing = Current file being operated on...
-car.help.return = To return to the main Plugin panel select
the "view" link from the header of this portlet.
+car.help.return = To return to the main Plugin panel, select
the "view" link from the header of this portlet.
car.index.assembleServer = Assemble a server
car.index.assembleServerLong = Assemble a server from plugins in this one
car.index.assemblyHelp.AppCentric.desp = Choose the application plugins that suit
your need and let your application plugins define the contents of your server. Your server
should be able to run your applications but may not be able to deploy anything.
car.index.assemblyHelp.AppCentric.title = Application Centric
-car.index.assemblyHelp.ExpertUser.desp = Choose the application plugins and system
plugins by configIds to construct your server. Please only choose this mode when you are
an expert user of Apache Geronimo, because you could end up with a server that is not able
to start or deploy anything.
-car.index.assemblyHelp.ExpertUser.title = Expert Users
+car.index.assemblyHelp.ExpertUser.desp = Choose the application plugins and system
plugins by configIds to construct your server. Choose this mode only when you are an expert
user of Apache Geronimo, because you could end up with a server that is not able to start
or deploy anything.
+car.index.assemblyHelp.ExpertUser.title = Expert User
car.index.assemblyHelp.FuncCentric.desp = Choose the functionalities that suit your
needs, along with any deployed application plugins.
car.index.assemblyHelp.FuncCentric.title = Function Centric
-car.index.assemblyHelp.desp = Assemble a server from geronimo plugins in
the current server. Please choose from one of the following 3 modes:
+car.index.assemblyHelp.desp = Assemble a server from geronimo plugins in
the current server. Choose from one of the following 3 modes:
car.index.assemblyHelp.note = <p>Note this portlet only works with
geronimo plugins. If your application is not a geronimo plugin, you have the following options:</p><p>-
Use the "Create Plugin" portlet from console to convert your application into a geronimo plugin<br/>-
Use car-maven-plugin to convert your application into a geronimo plugin<br/>- Deploy
your application after your server is assembled<br/></p>
car.index.assemblyMode = Custom Assembly Mode:
car.index.createGeronimoPluginExp = Choose a configuration in the current Geronimo
server to export as a Geronimo plugin. The configuration will be saved as a CAR file to your
local filesystem. <i>Note: at present, you must manually add a <tt>META-INF/geronimo-plugin.xml</tt>
file to the CAR after you export it in order for it to be a valid plugin.</i>
-car.index.createPluginHelp.desp = <p>Choose a configuration in the current
Geronimo server to export as Geronimo plugin. Fill out the plugin metadata information and
save the plugin as a car file to your local file system. The console will generate the <tt>geronimo-plugin.xml</tt>
file that stores the plugin metadata information for your project and package it into a car
file. You can configure many plugin metadata via admin console, however, you will not be
able to configure some of the advanced configuration, for example the <tt>config-xml-ceontent</tt>
or <tt>config-substitution properties</tt>.</p><p>If you like to generate
a geronimo plugin from command line, you can use the car-maven-plugin to generate a <tt>geronimo-plugin.xml</tt>
file for your project, package your project as a car file, and add your project onto the geronimo
plugin catalog (<tt>geronimo-plugins.xml</tt> file) automatically.</p>
+car.index.createPluginHelp.desp = <p>Choose a configuration in the current
Geronimo server to export as Geronimo plugin. Fill out the plugin metadata information and
save the plugin as a car file to your local file system. The console will generate the <tt>geronimo-plugin.xml</tt>
file that stores the plugin metadata information for your project and package it into a car
file. You can configure many plugin metadata via admin console, however, you will not be
able to configure some of the advanced configuration, for example the <tt>config-xml-ceontent</tt>
or <tt>config-substitution</tt> properties.</p><p>If you like to generate
a geronimo plugin from command line, you can use the car-maven-plugin to generate a <tt>geronimo-plugin.xml</tt>
file for your project, package your project as a car file, and add your project onto the geronimo
plugin catalog (<tt>geronimo-plugins.xml</tt> file) automatically.</p>
car.index.createPluginHelp.title = Create geronimo plugins
-car.index.installPluginHelp.desp = <p>Install geronimo plugins from a
local or remote repository into the current Geronimo server.</p> <p>Click on the
"Update Repository List" link to update the repository list to the latest recommended by the
server.</p> <p>If you don't see your desired repository, click on the "Add Repository"
link to add additional repository of your choice. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository. </p>
+car.index.installPluginHelp.desp = <p>Install geronimo plugins from a
local or remote repository into the current Geronimo server.</p> <p>Click the
"Update Repository List" link to update the repository list to the latest recommended by the
server.</p> <p>If you don't see your desired repository, click the "Add Repository"
link to add additional repository of your choice. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository. </p>
car.index.installPluginHelp.title = Install geronimo plugins
car.index.optionalAuthentication = Optional Authentication
car.index.removePluginsExp = To remove a plugin, use the categories under
<b>Applications</b> to locate the plugin module and uninstall it.
-car.index.summary = <h2>Install Geronimo Plugins</h2>
<p>This portlet lets you install Geronimo plugins. This can be used to install new features
into a Geronimo server at runtime.</p> <p>Choose a local or remote repository
to inspect for available Geronimo plugins. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository.</p> <p>You
can also download running configurations from another Geronimo server just as if you're browsing
and installing third-party plugins. If you want to point to a remote Geronimo server, enter
a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt> and the
enter the administrator username and password in the optional authentication fields.</p>
+car.index.summary = <h2>Install Geronimo Plugins</h2>
<p>This portlet lets you install Geronimo plugins. This can be used to install new features
into a Geronimo server at runtime.</p> <p>Choose a local or remote repository
to inspect for available Geronimo plugins. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository.</p> <p>You
can also download running configurations from another Geronimo server just as if you're browsing
and installing third-party plugins. If you want to point to a remote Geronimo server, enter
a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt> and then
enter the administrator username and password in the optional authentication fields.</p>
car.index.updateRepositoryList = Update Repository List
car.index.validateConfig = Please select a configuration to export.
car.list.PluginGroup = Plugin Groups in local server:
@@ -118,7 +118,7 @@
car.pluginParams.openSourceExp = Check this box if the license is an OSI-approved
open source license (see <a href="http://www.opensource.org/licenses/index.php">http://www.opensource.org/licenses/index.php</a>).
car.pluginParams.pluginURLExp = A URL to get more information about the plugin
(e.g. the plugin home page).
car.pluginParams.prereqDescriptionExp = A longer description of what the user needs
to do to comply with this prerequisite (for example, instructions to set up a database pool
listing the supported database products and telling the user where to find a script to initialize
the database). This should be plain text with empty lines to separate paragraphs.
-car.pluginParams.prerequisiteIDExp = The module ID of a prerequisite for this
plugin. This is a module that must be present in the server before the plugin can be installed.
It may be something like a specific web container for a web application (<tt>geronimo/jetty/*/car</tt>)
or something like a database pool or security realm that the user must install because the
plugin author can't create a value that will be valid in the destination server. You may
want to leave out as many segments of the module ID as possible in order to accommodate more
users (e.g. <tt>*/mypool/*/*</tt> rather than <tt>myapp/mypool/1.2/car</tt>).
+car.pluginParams.prerequisiteIDExp = The module ID of a prerequisite for this
plugin. This is a module that must be present in the server before the plugin can be installed.
It may be something like a specific web container for a web application (<tt>geronimo/jetty/*/car</tt>)
or something like a database pool or security realm that the user must install because the
plugin author can't create a value that will be valid in the destination server. You may
want to leave out as many segments of the module ID as possible in order to accommodate more
users ( for example, <tt>*/mypool/*/*</tt> rather than <tt>myapp/mypool/1.2/car</tt>).
car.pluginParams.prerequisiteTypeExp = A brief description of the type of prerequisite
this is (for the benefit of the user). Examples could include <tt>Database Pool</tt>
or <tt>Web Container</tt>.
car.pluginParams.title = <b>Export Plugin</b> -- Configure
Plugin Data
car.pluginParams.uniqueIDExp = The globally unique ID for this plugin.
This is determined from the installation in the server you're exporting. This defines the
version number for the plugin, so make sure it's correct.
@@ -185,8 +185,8 @@
realmwizard._sql.JDBCUrlExp = The JDBC URL that specifies
the details of the database to connect to. This has a different form for each JDBC driver.
realmwizard._sql.JDBCUsernameExp = The username used to connect
to the database
realmwizard._sql.databasePoolExp = A database pool that the login
module will use to connect to the database. If this is specified, none of the rest of the
settings after this are necessary.
-realmwizard._sql.digestAlgorithmExp = Message Digest algorithm (e.g.
MD5, SHA1, etc.) used on the passwords. Leave this field empty if no digest algorithm is
used.
-realmwizard._sql.digestEncodingExp = Encoding to use for digests
(e.g. hex, base64). This is used only if a Message Digest algorithm is specified.If no encoding
is specified, hex will be used.
+realmwizard._sql.digestAlgorithmExp = Message Digest algorithm (for
example, MD5, SHA1 and so on) used on the passwords. Leave this field empty if no digest
algorithm is used.
+realmwizard._sql.digestEncodingExp = Encoding to use for digests
(for example, hex, base64). This is used only if a Message Digest algorithm is specified.If
no encoding is specified, hex will be used.
realmwizard._sql.driverJARExp = The JAR holding the selected
JDBC driver. Should be installed under GERONIMO/repository/ to appear in this list.
realmwizard._sql.eitherPoolOrJDBC = A SQL security realm must
either have a database pool or JDBC connectivity settings to connect to the database. Please
select EITHER the database pool, OR the rest of the JDBC settings.
realmwizard._sql.groupSelectSQLExp = A SQL statement to load group
information for a user. It should return 2 columns, the first holding a username and the
second holding a group name. The statement may use the PreparedStatement syntax of ? for
a parameter, in which case the username will be set for every parameter. A typical setting
would be <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt>
or for a more normalized schema, <tt>SELECT u.username, g.name FROM app_users u,
groups g, user_groups ug WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt>
@@ -198,11 +198,11 @@
realmwizard.advanced.failuresWithin = failures within
realmwizard.advanced.failuresWithinSeconds = seconds
realmwizard.advanced.global = Global
-realmwizard.advanced.global.description = If global, security realm
name must be unique but is available to ejbs. If not global, name does not need to be unique.
In any case, realm plugin must be a parent of a web app to be visible to that app.
+realmwizard.advanced.global.description = If global, security realm
name must be unique but is available to EJBs. If not global, name does not need to be unique.
In any case, realm plugin must be a parent of a web app to be visible to that app.
realmwizard.advanced.keepAccountLockedFor = and keep the account locked
for
realmwizard.advanced.keepAccountLockedForSeconds = seconds
realmwizard.advanced.lockUserAfter = Lock a user after
-realmwizard.advanced.lockoutEnabledExp = If enabled, a certain number
of failed logins in a particular time frame will cause a user's account to be locked for a
certain period of time. This is a defense against brute force account cracking attacks.
+realmwizard.advanced.lockoutEnabledExp = If enabled, a certain number
of failed logins in a particular time frame will cause a user's account to be locked for a
certain period of time. This is a defence against brute force account cracking attacks.
realmwizard.advanced.namedCredential = Named Credential
realmwizard.advanced.storePasswordEnabledExp = If enabled, the realm will
store each user's password in a private credential in the Subject. This will allow access
to the password later after the login process has completed. This is not normally required.
realmwizard.advanced.title = <b>Create Security Realm</b>
-- Step 3: Advanced Configuration
@@ -253,7 +253,7 @@
realmwizard.configure.certprops.groupsURI.name = Groups File URI
realmwizard.configure.certprops.usersURI.description = The location of a properties
file (relative to the Geronimo home dir) holding certificate to user mapping information.
The format of each line should be <tt>username=certificatename</tt> where certificate
name is <tt>X509Certificate.getSubjectX500Principal().getName()</tt>
realmwizard.configure.certprops.usersURI.name = Users File URI
-realmwizard.configure.ldap.authentication.description = The security level to use,
which can be <tt>none</tt>, <tt>simple</tt>, or <tt>strong</tt>
(the usual value is <tt>simple</tt>. If this property is unspecified, the behavior
is determined by the service provider.
+realmwizard.configure.ldap.authentication.description = The security level to use,
which can be <tt>none</tt>, <tt>simple</tt>, or <tt>strong</tt>
(the usual value is <tt>simple</tt>. If this property is unspecified, the behaviour
is determined by the service provider.
realmwizard.configure.ldap.authentication.name = Authentication
realmwizard.configure.ldap.connectionPassword.description = The password used to connect
to the LDAP server.
realmwizard.configure.ldap.connectionPassword.name = Connect Password
@@ -261,7 +261,7 @@
realmwizard.configure.ldap.connectionProtocol.name = Connect Protocol
realmwizard.configure.ldap.connectionURL.description = A URL that describes how to
connect to the LDAP server. Normally this would be <tt>ldap://ldap-server-hostname:389</tt>
(or for the Apache directory server included with Geronimo, <tt>ldap://localhost:1389</tt>).
realmwizard.configure.ldap.connectionURL.name = Connection URL
-realmwizard.configure.ldap.connectionUsername.description = The user name used to connect
to the LDAP server. Should be an administrator or Directory manager that has access to examine
other users' passwords.
+realmwizard.configure.ldap.connectionUsername.description = The username used to connect
to the LDAP server. Should be an administrator or Directory manager that has access to examine
other users' passwords.
realmwizard.configure.ldap.connectionUsername.name = Connect Username
realmwizard.configure.ldap.initialContextFactory.description = The fully-qualified class
name of the initial context factory. If you don't know what to use here, you should use <tt>com.sun.jndi.ldap.LdapCtxFactory</tt>.
realmwizard.configure.ldap.initialContextFactory.name = Initial Context Factory
@@ -281,9 +281,9 @@
realmwizard.configure.ldap.userSearchMatching.name = User Search Matching
realmwizard.configure.ldap.userSearchSubtree.description = If set to <tt>true</tt>,
then subtrees under the "User Base" will be searched for users too. If set to <tt>false</tt>,
then only the "User Base" location itself will be searched.
realmwizard.configure.ldap.userSearchSubtree.name = User Search Subtree
-realmwizard.configure.props.digest.description = Message Digest algorithm (e.g.
MD5, SHA1, etc.) used on the passwords. Leave this field empty if no digest algorithm is
used.
+realmwizard.configure.props.digest.description = Message Digest algorithm (for
example, MD5, SHA1 and so on) used on the passwords. Leave this field empty if no digest
algorithm is used.
realmwizard.configure.props.digest.name = Digest Algorithm
-realmwizard.configure.props.encoding.description = Encoding to use for digests
(e.g. hex, base64). This is used only if a Message Digest algorithm is specified. If no
encoding is specified, hex will be used.
+realmwizard.configure.props.encoding.description = Encoding to use for digests
(for example, hex, base64). This is used only if a Message Digest algorithm is specified.
If no encoding is specified, hex will be used.
realmwizard.configure.props.encoding.name = Digest Encoding
realmwizard.configure.props.groupsURI.description = The location of a properties
file (relative to the Geronimo home dir) holding group information. The format of each line
should be <tt>group=user,user,...</tt>.
realmwizard.configure.props.groupsURI.name = Groups File URI
Modified: geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties Mon Dec 7 08:10:25 2009
@@ -16,7 +16,7 @@
#=====================================================================
classloaderview.help.content = è¿ä¸ªè§å¾å¯ç¨äºæ¥çæå¡å¨å
å«çææç±»å è½½å¨åç±»å è½½å¨å è½½çææç±»ã
-classloaderview.help.title = è¿æ¯Geronimo管çç±»å è½½å¨è§å¾é¡µé¢ç帮å©é¡µé¢ã
+classloaderview.help.title = ç±»å è½½å¨æ¥çå¨å¸®å©é¡µé¢
classloaderview.view.invertTree = å转æ
classloaderview.view.searchOnlySelected = ä»
æ¥æ¾éä¸é¡¹
classloaderview.view.searchText = æ¥æ¾å
容
@@ -28,23 +28,23 @@
debugviews.common.noText = 请æå®å
³é®è¯
dependencyview.help.summary = è¿ä¸ªè§å¾å¯ä»¥ç¨äºæ¥çææ模ååå®ä»¬çä¾èµé¡¹ã
-dependencyview.help.title = è¿æ¯ä¸ä¸ªå¸®å©é¡µé¢ï¼æå¯¼ä½ å¦ä½ä½¿ç¨Geronimoæ§å¶å°çä¾èµè§å¾ã
+dependencyview.help.title = ä¾èµé¡¹æ¥çå¨å¸®å©é¡µé¢ã
dependencyview.view.searchOnlySelected = ä»
æ¥æ¾æéæ©èç¹
dependencyview.view.searchText = æç´¢æå
jmxmanager.help.JMXTree = JMXæ
-jmxmanager.help.JMXTreeExp1 = <li>å¯ä»¥éè¿æ¬é¡µé¢æ¥æ¥çä¸åç±»åçMBeans</li> <li>æ¯ä¸ä¸ªMBeanç±æ ä¸çä¸ä¸ªæ¾ç¤ºå¯¹è±¡å称çèç¹è¡¨ç¤º</li><li>'All MBeans' ååºäºæ ¹æ®åæ¥åç»çMBean</li> <li>'J2EE MBeans' ååºäºæ ¹æ®JSR 77ä¸çMBeanç±»åæ¥åç»çMBeans:</li>
+jmxmanager.help.JMXTreeExp1 = <li>å¯ä»¥éè¿æ¬é¡µé¢æ¥æ¥çä¸åç±»åç MBeans</li> <li>æ¯ä¸ä¸ª MBean ç±æ ä¸çä¸ä¸ªæ¾ç¤ºå¯¹è±¡å称çèç¹è¡¨ç¤º</li><li>'All MBeans' ååºäºæ ¹æ®åæ¥åç»ç MBean</li> <li>'J2EE MBeans' ååºäºæ ¹æ® JSR-77 ä¸ç MBean ç±»åæ¥åç»ç MBeansï¼</li>
jmxmanager.help.abstractName = æ½è±¡å称
jmxmanager.help.attributes = å±æ§
jmxmanager.help.attributesTab = å±æ§é项å¡
-jmxmanager.help.attributesTabExp = <ul><li>ååºMBeanå±æ§</li> <li>å¯ä»¥ç¹å»åç头é¨ä»¥æåº</li><li>å¯ä»¥ç¹å»è¡¨çæ¯ä¸è¡ä»¥åè®°å·,æ¹ä¾¿æ¥ç</li><li>å¯ä»¥ç¹å»Setteræé®ä»¥è®¾ç½®å±æ§å¼å¹¶æ¾ç¤ºç»æ.</li> <li><b>注æ:</b>请å°å¿è®¾ç½®MBeançå±æ§å¼å 为å®å°å½±åå°æå¡å¨çè¿è¡.</li></ul>
+jmxmanager.help.attributesTabExp = <ul><li>ååº MBean å±æ§</li> <li>å¯ä»¥ç¹å»åç头é¨ä»¥æåº</li><li>å¯ä»¥ç¹å»è¡¨çæ¯ä¸è¡ä»¥åè®°å·ï¼æ¹ä¾¿æ¥ç</li><li>å¯ä»¥ç¹å»Setteræé®ä»¥è®¾ç½®å±æ§å¼å¹¶æ¾ç¤ºç»æã</li> <li><b>注æï¼</b>请å°å¿è®¾ç½® MBean çå±æ§å¼å 为å®å°å½±åå°æå¡å¨çè¿è¡ã</li></ul>
jmxmanager.help.className = ç±»å
jmxmanager.help.domain = å
-jmxmanager.help.geronimoMBeansExp = 'Geronimo MBeans'å°æç
§Geronimoç¹å®çMBeanç±»ååç»ååºMBean
+jmxmanager.help.geronimoMBeansExp = 'Geronimo MBeans' å°æç
§ Geronimo ç¹å®ç MBean ç±»ååç»ååº MBean
jmxmanager.help.getter = Getter
jmxmanager.help.info = ä¿¡æ¯
jmxmanager.help.infoTab = ä¿¡æ¯é项å¡
-jmxmanager.help.infoTabExp = ååºMBeançåºæ¬ä¿¡æ¯
+jmxmanager.help.infoTabExp = ååº MBean çåºæ¬ä¿¡æ¯
jmxmanager.help.j2eeType = J2EEç±»å
jmxmanager.help.manageable = å¯ç®¡çç
jmxmanager.help.name = å称
@@ -52,14 +52,14 @@
jmxmanager.help.objectNamePattern = 对象 å称 模å¼
jmxmanager.help.operations = æä½
jmxmanager.help.operationsTab = æä½é项å¡
-jmxmanager.help.operationsTabExp = <ul> <li>ååºMBeanæä½</li><li>ä½ å¯ä»¥æä¾ä¸åçåæ°å¼ç¶åç¹å»æä½æé®ä»¥æ§è¡MBeanæä½å¹¶æ¥çç»æ.</li> <li><b>Note:</b> å°å¿è°ç¨MBeançæä½å 为å®å¯è½ä¼å½±åå°æå¡å¨çè¿è¡.</li></ul>
+jmxmanager.help.operationsTabExp = <ul> <li>ååº MBean æä½</li><li>ä½ å¯ä»¥æä¾ä¸åçåæ°å¼ç¶åç¹å»æä½æé®ä»¥æ§è¡ MBean æä½å¹¶æ¥çç»æã</li> <li><b>注æï¼</b> å°å¿è°ç¨ MBean çæä½å 为å®å¯è½ä¼å½±åå°æå¡å¨çè¿è¡ã</li></ul>
jmxmanager.help.paramList = åæ°å表
jmxmanager.help.persistent = æä¹
ç
jmxmanager.help.refreshStats = å·æ°ç»è®¡
jmxmanager.help.search = æç´¢
-jmxmanager.help.searchMBeansExp = 'æç´¢MBean'å°ååºå¹é
'Search'é项å¡ä¸ç模å¼çMBean
+jmxmanager.help.searchMBeansExp = 'æç´¢ MBean'å°ååºå¹é
'Search' é项å¡ä¸ç模å¼ç MBean
jmxmanager.help.searchTab = æç´¢é项å¡
-jmxmanager.help.searchTabExp = <ul> <li>ä½ å¯ä»¥ä½¿ç¨è¿ä¸ªé项å¡æ¥æ¥è¯¢æ»¡è¶³ç¹å®æ¨¡å¼ççMBean</li> <li>满足çMBeanå°è¢«æ·»å å°'æç´¢MBeans'çæ èç¹ä¸. ä½ å¯è½éè¦åä¸æ»å¨JMXæ 以æ¥çç»æ.</li> <li>对象å称模å¼çä¾å:</li> <ul> <li>"*:*" - å°è¿åææçMBean <li>"geronimo:*" - å°è¿å"geronimo"åä¸çææMBean <li>"*:j2eeType=GBean,*" - å°è¿åææçGBean </ul> </ul>
+jmxmanager.help.searchTabExp = <ul> <li>ä½ å¯ä»¥ä½¿ç¨è¿ä¸ªé项å¡æ¥æ¥è¯¢æ»¡è¶³ç¹å®æ¨¡å¼çç MBean</li> <li>满足çMBeanå°è¢«æ·»å å°'æç´¢MBeans'çæ èç¹ä¸. ä½ å¯è½éè¦åä¸æ»å¨JMXæ 以æ¥çç»æ.</li> <li>对象å称模å¼çä¾å:</li> <ul> <li>"*:*" - å°è¿åææçMBean <li>"geronimo:*" - å°è¿å"geronimo"åä¸çææMBean <li>"*:j2eeType=GBean,*" - å°è¿åææçGBean </ul> </ul>
jmxmanager.help.setter = Setter
jmxmanager.help.stats = ç»è®¡
jmxmanager.help.statsTab = ç»è®¡é项å¡
@@ -69,18 +69,18 @@
jmxmanager.help.viewAttributes = æ¥çå±æ§
jmxmanager.help.viewInfo = æ¥çä¿¡æ¯
jmxmanager.help.viewOperations = æ¥çæä½
-jmxmanager.help.viewStats = èçç»è®¡
+jmxmanager.help.viewStats = æ¥çç»è®¡
-jndiview.help.content = è¿ä¸ªé¡µé¢ç¨äºæ¥çåç§æ¨¡åçJNDIç¯å¢ã
-jndiview.help.title = è¿æ¯Geronimo管çæ§å¶å°æ¥çJNDI页é¢ç帮å©é¡µé¢ã
+jndiview.help.content = è¿ä¸ªé¡µé¢ç¨äºæ¥çåç§æ¨¡åç JNDI ç¯å¢ã
+jndiview.help.title = JNDI æ¥çå¨å¸®å©é¡µé¢
jndiview.view.caseSensitive = åºå大å°å
jndiview.view.searchOnlySelected = åªæ索已éå®ç
jndiview.view.searchText = æ¥æ¾æå
-keystore.jmxmanager.title = JMXæ¥çå¨Portlet帮å©
+keystore.jmxmanager.title = JMX æ¥çå¨å¸®å©é¡µé¢
-ldapmanager.help.canDoTheFollowing = <p>LDAPæ¥çå¨portletå¯ç¨æ¥åæ§è¡å¦ä¸ä»»å¡:<ul> <li>è¿æ¥å°ä»»ä½LDAPæå¡å¨å¹¶æµè§å
¶å
容(é»è®¤æ¯å
ç½®çLDAPæå¡å¨ - Apache DS) <li>æ¥çæ¡ç®çå±æ§ <li>å¨æå®æ¡ç®ä¸æ§è¡LDAPæç´¢ <li>å·æ°ä»»ä½æ¡ç®ä»¥ä»ç®å½æå¡å¨åå¾ææ°æ°æ® <li>æ¥çLDAPè¿æ¥çç¯å¢æ°æ® </ul>
-ldapmanager.help.note = 注æ:å³å»ä»»ä½æ èç¹å¯æ¥çä¸ä¸æèå以æ§è¡æä½
+ldapmanager.help.canDoTheFollowing = <p>LDAPè§å¾é¡µé¢å¯ç¨æ¥åæ§è¡å¦ä¸ä»»å¡ï¼<ul> <li>è¿æ¥å°ä»»æ LDAP æå¡å¨å¹¶æµè§å
¶å
容(é»è®¤æ¯å
ç½®ç LDAP æå¡å¨ - Apache DS) <li>æ¥çæ¡ç®çå±æ§ <li>å¨æå®æ¡ç®ä¸æ§è¡ LDAP æç´¢ <li>å·æ°ä»»ä½æ¡ç®ä»¥ä»ç®å½æå¡å¨åå¾ææ°æ°æ® <li>æ¥ç LDAP è¿æ¥çç¯å¢æ°æ® </ul>
+ldapmanager.help.note = 注æï¼å³å»ä»»ä½æ èç¹å¯æ¥çä¸ä¸æèå以æ§è¡æä½
ldapmanager.viewLDAPServer.DN = DN
ldapmanager.viewLDAPServer.SSL = SSL
ldapmanager.viewLDAPServer.anonymousBind = å¿åç»å®
Modified: geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties Mon Dec 7 08:10:25 2009
@@ -31,30 +31,30 @@
monitor.common.nav = Navigation
monitor.common.none = none
monitor.common.other = Other
-monitor.common.ret = To return to the main Monitoring panel select the "view" link from the header of this portlet.
+monitor.common.ret = To return to the main Monitoring panel, select the "view" link in the upper-right corner of this portlet.
monitor.common.save = Save
monitor.common.server = Servers
monitor.common.st = something
monitor.common.unknown = Unknown
monitor.common.view = Views
monitor.common.restore = Reset
-monitor.edit.desc = This is the edit page for the Monitoring Portlet
-monitor.edit.msg01 = Click on 'Monitoring → Add Server'. Choose
-monitor.edit.msg02 = The Server 'localhost' will appear 'online' i.e. the monitoring console can talk to it.
-monitor.edit.msg03 = Enable data collection by clicking on 'Enable Query'.
-monitor.edit.msg04 = Click on 'localhost' to view live statistics for chosen MBeans. By default 4/5 Mbeans are chosen for statistics collection. Use '<b>x</b>' to remove MBeans from 'Statistics Collected'. Use '<b>+</b>' in 'Statistics Available' to add an MBean to 'Statistics Collected' MBeans.
+monitor.edit.desc = This is the edit page for the <b>Monitoring</b> Portlet
+monitor.edit.msg01 = Click 'Monitoring→ Add Server'. Choose
+monitor.edit.msg02 = The Server 'localhost' will appear 'online', which means the monitoring console can talk to it.
+monitor.edit.msg03 = Click 'Enable Query' to enable data collection.
+monitor.edit.msg04 = Click 'localhost' to view live statistics for chosen MBeans. By default 4/5 Mbeans are chosen for statistics collection. Use '<b>x</b>' to remove MBeans from 'Statistics Collected'. Use '<b>+</b>' in 'Statistics Available' to add an MBean to 'Statistics Collected' MBeans.
monitor.edit.msg05 = To plot a graph for a statistics click on a link in 'Live Statistics'.
monitor.edit.msg06 = As an example choose 'JMV Heap Size Current'. Choose the following values
-monitor.edit.msg07 = must be a unique name
+monitor.edit.msg07 = A unique name for the graph
monitor.edit.msg08 = The label for the graph
-monitor.edit.msg09 = Y axis for the graph, e.g. JVM Heap - MB
-monitor.edit.msg10 = Save the graph using 'save'
-monitor.edit.msg11 = To plot a graph for bytes sent each interval click on 'BytesSent' for TomcatWebConnector. Use the following values
-monitor.edit.msg12 = Y axis for the graph, e.g. Bytes Sent/sec
-monitor.edit.msg13 = i.e. the bytes sent during 5 minutes (300 sec)
-monitor.edit.msg14 = Hint : Try 'Request Count' and 'Open Connections' for JettyWebConnector
-monitor.edit.msg15 = Create a view using 'Add view'. Select all the graphs and save the view.
-monitor.edit.msg16 = To see the graphs use 'Show this view'
+monitor.edit.msg09 = Y axis for the graph, for example, JVM Heap - MB
+monitor.edit.msg10 = Click 'Save' to save the graph
+monitor.edit.msg11 = To plot a graph for bytes sent each interval click 'BytesSent' for TomcatWebConnector. Use the following values
+monitor.edit.msg12 = Y axis for the graph, for example, Bytes Sent/sec
+monitor.edit.msg13 = For example, the bytes sent during 5 minutes (300 sec)
+monitor.edit.msg14 = Notes: Try 'Request Count' and 'Open Connections' for JettyWebConnector
+monitor.edit.msg15 = Click 'Create a view' to add a new view. Select all the graphs and save the view.
+monitor.edit.msg16 = Click the name of the view to see the graphs.
monitor.edit.stuff = Edit stuff...
monitor.graph.addGraph = Add a new graph
monitor.graph.asis = As-is
Modified: geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties Mon Dec 7 08:10:25 2009
@@ -31,49 +31,49 @@
monitor.common.nav = 导èª
monitor.common.none = æ
monitor.common.other = å
¶å®
-monitor.common.ret = ç¹å»portlet头é¨çâè§å¾âé¾æ¥è¿åçæ§ä¸»é¡µé¢
+monitor.common.ret = ç¹å» portlet å³ä¸è§çâè§å¾âé¾æ¥è¿åçæ§ä¸»é¡µé¢
monitor.common.save = ä¿å
monitor.common.server = æå¡å¨
monitor.common.st = ä»ä¹
monitor.common.unknown = æªç¥
monitor.common.view = è§å¾
monitor.common.restore = éç½®
-monitor.edit.desc = è¿æ¯çæ§å¨portletçç¼è¾é¡µé¢
+monitor.edit.desc = è¿æ¯çæ§å¨ portlet çç¼è¾é¡µé¢
monitor.edit.msg01 = ç¹å» 'çæ§å¨ → æ·»å æå¡å¨'. éæ©
-monitor.edit.msg02 = æå¡å¨ 'localhost'å°æ¾ç¤ºä¸º 'å¨çº¿'',亦å³çæ§å¨æ§å¶å°å¯ä»¥ä¸å®äº¤äº
+monitor.edit.msg02 = æå¡å¨ 'localhost'å°æ¾ç¤ºä¸º 'å¨çº¿'',å³è¡¨ç¤ºçæ§å¨æ§å¶å°å¯ä»¥ä¸å®äº¤äº
monitor.edit.msg03 = ç¹å»'å¯ç¨æ¥è¯¢'以å¯ç¨æ°æ®æ¶é
-monitor.edit.msg04 = ç¹å»'localhost'以æ¥çéå®MBeançå®æ¶ç»è®¡. é»è®¤æ4/5çMBean被æ¶éç¨äºç»è®¡.ä½¿ç¨ '<b>x</b>'ä»'å·²æ¶éç»è®¡'ä¸ç§»é¤MBean.使ç¨'å¯ç¨ç»è®¡'ä¸ç '<b>+</b>'以添å ä¸ä¸ªMBeanå°'å·²æ¶éç»è®¡'çMBeanä¸
+monitor.edit.msg04 = ç¹å»'localhost' 以æ¥çéå® MBean çå®æ¶ç»è®¡ä¿¡æ¯. é»è®¤æ 4/5 ç MBean 被æ¶éç¨äºç»è®¡.ä½¿ç¨ '<b>x</b>'ä»'å·²æ¶éç»è®¡'ä¸ç§»é¤MBean.使ç¨'å¯ç¨ç»è®¡'ä¸ç '<b>+</b>'以添å ä¸ä¸ª MBean å°'å·²æ¶éç»è®¡'ç MBean ä¸
monitor.edit.msg05 = ç¹å»'å®æ¶ç»è®¡'ä¸çé¾æ¥ä»¥ç»å¶ç»è®¡å¾
-monitor.edit.msg06 = 举ä¾è¯´æï¼éæ© 'å½åJMVå 大å°'.éæ©ä¸åå¼
+monitor.edit.msg06 = 举ä¾è¯´æï¼éæ© 'å½å JMV å 大å°'.éæ©ä¸åå¼
monitor.edit.msg07 = å称å¿
é¡»å¯ä¸
monitor.edit.msg08 = å¾å½¢çæ ç¾
-monitor.edit.msg09 = å¾å½¢çYè½´,ä¾å¦.JVM å - MB
+monitor.edit.msg09 = å¾å½¢ç Y è½´,ä¾å¦ JVM å - MB
monitor.edit.msg10 = ç¹å»'ä¿å'以ä¿åå¾å½¢
-monitor.edit.msg11 = ç¹å»TomcatWebConnectorç 'å·²ä¼ éåèæ°'以ç»å¶æ¯ä¸ªæ¶é´é´éä¼ éåèæ°çå¾å½¢.使ç¨å¦ä¸å¼
+monitor.edit.msg11 = ç¹å» TomcatWebConnector ç 'å·²ä¼ éåèæ°'以ç»å¶æ¯ä¸ªæ¶é´é´éä¼ éåèæ°çå¾å½¢ã使ç¨å¦ä¸å¼
monitor.edit.msg12 = å¾å½¢çYè½´,lä¾å¦.ä¼ éåèæ°/ç§
-monitor.edit.msg13 = 亦å³.5åéå
ä¼ éçåèæ°(300ç§)
-monitor.edit.msg14 = æ示:请å°è¯JettyWebConnectorå¦ææ³çæ§ 'Request Count' ä¸ 'Open Connections'
-monitor.edit.msg15 = 使ç¨'æ·»å è§å¾'以æ°å»ºè§å¾.éæ©ææå¾å½¢å¹¶ä¿å该è§å¾
-monitor.edit.msg16 = 使ç¨'æ¾ç¤ºè§å¾'以æ¥çå¾å½¢
+monitor.edit.msg13 = 亦å³.5åéå
ä¼ éçåèæ°( 300 ç§)
+monitor.edit.msg14 = 注æï¼å¦ææ³çæ§ JettyWebConnectorï¼è¯·éæ© '请æ±æ° ä¸ 'å¼æ¾è¿æ¥æ°'ä¿¡æ¯
+monitor.edit.msg15 = åå»'å建æ°è§å¾'以添å ä¸ä¸ªè§å¾ãéæ©ææå¾å½¢å¹¶ä¿å该è§å¾
+monitor.edit.msg16 = åå»è§å¾å称以æ¥çå
¶å¾å½¢è¡¨ç¤º
monitor.edit.stuff = ç¼è¾...
monitor.graph.addGraph = æ·»å æ°å¾å½¢
-monitor.graph.asis = As-is
+monitor.graph.asis = ä¿çå½åå¼
monitor.graph.change = æ¹å (å¢é)
monitor.graph.createGraph = å建å¾å½¢
monitor.graph.data = æ°æ®åºå
monitor.graph.deleteGraph = å é¤å¾å½¢
monitor.graph.math = æ°å¦è¿ç®
monitor.graph.notExist = å¾å½¢ä¸åå¨
-monitor.graph.selectMbeanFirst = 请å
éæ©MBean
-monitor.graph.selectOpFirst = 请å
éæ©è¿ç®
+monitor.graph.selectMbeanFirst = 请å
éæ© MBean
+monitor.graph.selectOpFirst = 请å
éæ©ç®æ³
monitor.graph.selectServer = éæ©æå¡å¨
monitor.graph.selectServerFirst = 请å
éæ©æå¡å¨
monitor.graph.server = æå¡å¨
monitor.graph.showArchive = æ¥çåæ¡£
monitor.graph.time = æ¶é´å¸§
-monitor.graph.x = Xè½´æ ç¾
-monitor.graph.y = Yè½´æ ç¾
-monitor.help.desc = çæ§å¨æ§å¶å°è¢«è®¾è®¡ç¨æ¥çæ§å¨åç¬çJVMä¸è¿è¡çgeronimoå®ä¾.ä½ä¸ºä¸ä¸ªå¿«éæ¼ç¤º,æ们å°æ¥çæ£å¨è¿è¡çæ§å¨æ§å¶å°çGeronimoçå®ä¾.
+monitor.graph.x = X è½´æ ç¾
+monitor.graph.y = Y è½´æ ç¾
+monitor.help.desc = çæ§å¨æ§å¶å°è¢«è®¾è®¡ç¨æ¥çæ§å¨åç¬ç JVM ä¸è¿è¡ç Geronimo å®ä¾.ä½ä¸ºä¸ä¸ªå¿«éæ¼ç¤º,æ们å°æ¥çæ£å¨è¿è¡çæ§å¨æ§å¶å°ç Geronimo çå®ä¾.
monitor.help.title = 欢è¿æ¥å°çæ§å¨æ§å¶å°
monitor.server.addServer = æ·»å æå¡å¨
monitor.server.deleteServer = å é¤æå¡å¨
@@ -103,7 +103,7 @@
monitor.server.snapshotThread = å¿«ç
§çº¿ç¨
monitor.server.statAvailable = å¯ç¨ç»è®¡
monitor.server.statCollected = å·²æ¶éç»è®¡
-monitor.server.statNA = ç»è®¡beanå½åä¸å¯ç¨
+monitor.server.statNA = ç»è®¡ Bean å½åä¸å¯ç¨
monitor.server.statQuery = ç»è®¡æ¥è¯¢
monitor.server.status = ç¶æ
monitor.server.stopped = å·²ç»æ¢
@@ -120,5 +120,5 @@
monitor.view.modified = 已修æ¹
monitor.view.modify = ä¿®æ¹è§å¾
monitor.view.notExist = è§å¾ä¸åå¨
-monitor.view.notExistOrDisabled = è§å¾ä¸åå¨æå·²ç¦ç¨
+monitor.view.notExistOrDisabled = è§å¾ä¸åå¨æ被ç¦ç¨
monitor.view.show = æ¾ç¤ºè§å¾
Modified: geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:10:25 2009
@@ -27,17 +27,17 @@
mconsole.errorMsg08 = Server id <b>{0}</b> not found in database.
mconsole.errorMsg09 = Snapshot thread could <b>NOT</b> be stopped on server <b>{0}</b>.
mconsole.errorMsg10 = Snapshot thread could <b>NOT</b> be started on server <b>{0}</b>.
-mconsole.errorMsg11 = Error encountered while updating view <b>{0}</b>.
-mconsole.errorMsg12 = Error encountered while adding view <b>{0}</b>.
-mconsole.errorMsg13 = Error encountered while updating server.
-mconsole.errorMsg14 = Error encountered while adding server.
-mconsole.errorMsg15 = Error encountered while deleting server.
-mconsole.errorMsg16 = Error encountered while deleting view.
-mconsole.errorMsg17 = Error encountered while adding graph.
-mconsole.errorMsg18 = Error encountered while updating graph.
-mconsole.errorMsg19 = Error encountered while deleting graph.
-mconsole.errorMsg20 = Please delete all the graphs belongs to the server before deleting it.
-mconsole.errorMsg21 = Error encountered while reseting data.
+mconsole.errorMsg11 = An error encountered while updating view <b>{0}</b>.
+mconsole.errorMsg12 = An error encountered while adding view <b>{0}</b>.
+mconsole.errorMsg13 = An error encountered while updating server.
+mconsole.errorMsg14 = An error encountered while adding server.
+mconsole.errorMsg15 = An error encountered while deleting server.
+mconsole.errorMsg16 = An error encountered while deleting view.
+mconsole.errorMsg17 = An error encountered while adding graph.
+mconsole.errorMsg18 = An error encountered while updating graph.
+mconsole.errorMsg19 = An error encountered while deleting graph.
+mconsole.errorMsg20 = Delete all the graphs belongs to the server before deleting it.
+mconsole.errorMsg21 = An error encountered while reseting data.
mconsole.infoMsg01 = Connection was successfully established.
mconsole.infoMsg02 = Server <b>{0}</b> was successfully enabled.
mconsole.infoMsg03 = Server <b>{0}</b> was successfully disabled.
Modified: geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties Mon Dec 7 08:10:25 2009
@@ -18,12 +18,12 @@
Monitoring = çæ§å¨
mconsole.errorMsg01 = å°æå¡å¨çè¿æ¥å建失败ã
-mconsole.errorMsg02 = server_id为<b>{0}</b>çæå¡å¨æ æ³å¯ç¨ã
-mconsole.errorMsg03 = server_id为<b>{0}</b>çæå¡å¨æ æ³ç¦ç¨ã
+mconsole.errorMsg02 = server_id 为<b>{0}</b>çæå¡å¨æ æ³å¯ç¨ã
+mconsole.errorMsg03 = server_id 为<b>{0}</b>çæå¡å¨æ æ³ç¦ç¨ã
mconsole.errorMsg04 = æ°æ®åºåçé误ã
mconsole.errorMsg05 = æ æ³è¿æ¥å°æå¡å¨<b>{0}</b>ã
-mconsole.errorMsg06 = æ æ³è·è¸ªæå¡å¨<b>{1}</b>ä¸çMBean<b>{0}</b>ã
-mconsole.errorMsg07 = æ æ³åæ¢è·è¸ªæå¡å¨<b>{1}</b>ä¸çMBean<b>{0}</b>ã
+mconsole.errorMsg06 = æ æ³è·è¸ªæå¡å¨<b>{1}</b>ä¸ç MBean<b>{0}</b>ã
+mconsole.errorMsg07 = æ æ³åæ¢è·è¸ªæå¡å¨<b>{1}</b>ä¸ç MBean<b>{0}</b>ã
mconsole.errorMsg08 = æ°æ®åºä¸ä¸åå¨id为<b>{0}</b>çæå¡å¨ã
mconsole.errorMsg09 = æ æ³åæ¢æå¡å¨<b>{0}</b>ä¸çå¿«ç
§çº¿ç¨ã
mconsole.errorMsg10 = æ æ³å¼å¯æå¡å¨<b>{0}</b>ä¸çå¿«ç
§çº¿ç¨ã
@@ -36,13 +36,13 @@
mconsole.errorMsg17 = æ·»å å¾å½¢æ¶éå°é误ã
mconsole.errorMsg18 = æ´æ°å¾å½¢æ¶éå°é误ã
mconsole.errorMsg19 = å é¤å¾å½¢æ¶éå°é误ã
-mconsole.errorMsg20 = 请å
å é¤ææå±äºè¿ä¸ªServerçGraphï¼åå é¤è¿ä¸ªServerã
+mconsole.errorMsg20 = 请å
å é¤ææå±äºè¿ä¸ªæå¡å¨çå¾å½¢ï¼åå é¤è¿ä¸ªæå¡å¨ã
mconsole.errorMsg21 = éç½®æ°æ®æ¶éå°é误
mconsole.infoMsg01 = æå建ç«è¿æ¥ã
mconsole.infoMsg02 = æåå¯ç¨æå¡å¨<b>{0}</b>ã
mconsole.infoMsg03 = æåç¦ç¨æå¡å¨<b>{0}</b>ã
-mconsole.infoMsg04 = å¼å§è·è¸ªæå¡å¨<b>{1}</b>ä¸çMBean<b>{0}</b>ã
-mconsole.infoMsg05 = åæ¢è·è¸ªæå¡å¨<b>{1}</b>ä¸çMBean<b>{0}</b>ã
+mconsole.infoMsg04 = å¼å§è·è¸ªæå¡å¨<b>{1}</b>ä¸ç MBean<b>{0}</b>ã
+mconsole.infoMsg05 = åæ¢è·è¸ªæå¡å¨<b>{1}</b>ä¸ç MBean<b>{0}</b>ã
mconsole.infoMsg06 = å·²åæ¢æå¡å¨<b>{0}</b>ä¸çå¿«ç
§çº¿ç¨ã
mconsole.infoMsg07 = å·²å¼å¯æå¡å¨<b>{0}</b>ä¸çå¿«ç
§çº¿ç¨ã
mconsole.infoMsg08 = å·²æ´æ°è§å¾<b>{0}</b>ã
Modified: geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties Mon Dec 7 08:10:25 2009
@@ -16,23 +16,23 @@
#=====================================================================
portlet.openejb.help.activation = ActivationSpecClass
-portlet.openejb.help.activationdesc = Specifies the activation spec class Default value is org.apache.activemq.ra.ActiveMQActivationSpec
+portlet.openejb.help.activationdesc = Specifies the activation spec class. Default value is org.apache.activemq.ra.ActiveMQActivationSpec
portlet.openejb.help.beanclassname = Bean Class Name
portlet.openejb.help.beanclassnamedesc = This is the name of the Bean Class.
portlet.openejb.help.bmpcontainer = BMP Container
portlet.openejb.help.bmppoolsize = PoolSize
-portlet.openejb.help.bmppoolsizedesc = Specifies the size of the bean pools for this bmp entity container.Default value is 10.
+portlet.openejb.help.bmppoolsizedesc = Specifies the size of the bean pools for this bmp entity container. Default value is 10.
portlet.openejb.help.bulkpassivate = BulkPassivate
-portlet.openejb.help.bulkpassivatedesc = Property name that specifies the number of instances to passivate at one time when doing bulk passivation.Default value is 100.
+portlet.openejb.help.bulkpassivatedesc = Property name that specifies the number of instances to passivate at one time when doing bulk passivation. Default value is 100.
portlet.openejb.help.businesslocal = Business Local Interfaces
-portlet.openejb.help.businesslocaldesc = Comma separated list of business local interfaces that the bean has.
+portlet.openejb.help.businesslocaldesc = Comma-separated list of business local interfaces that the bean has.
portlet.openejb.help.businessremote = Business Remote Interfaces
-portlet.openejb.help.businessremotedesc = Comma separated list of business remote interfaces that the bean has.
+portlet.openejb.help.businessremotedesc = Comma-separated list of business remote interfaces that the bean has.
portlet.openejb.help.cef = CmpEngineFactory
portlet.openejb.help.cefdesc = Default value is org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory.
portlet.openejb.help.cmpcontainer = CMP Container
portlet.openejb.help.containerinfo = Container Information
-portlet.openejb.help.containerinfodesc = This portlet also gives us information regarding the different types of OpenEJB containers that are running in Geronimo. We can get this information by clicking on the different containers shown in the tree. The editable fields for each container are shown below
+portlet.openejb.help.containerinfodesc = This portlet also gives us information regarding the different types of OpenEJB containers that are running in Geronimo. To get this information, click the different containers shown in the tree. The editable fields for each container are shown below
portlet.openejb.help.deploymentId = Deployment Id
portlet.openejb.help.deploymentIddesc = Deployment Id of the EJB.
portlet.openejb.help.ejbInfo = EJB Information.
@@ -42,9 +42,9 @@
portlet.openejb.help.ejbname = Ejb Name
portlet.openejb.help.ejbnamedesc = Name of the EJB.
portlet.openejb.help.instancelimit = InstanceLimit
-portlet.openejb.help.instancelimitdesc = Specifies the maximum number of bean instances that are allowed to exist for each MDB deployment.Default value is 10.
+portlet.openejb.help.instancelimitdesc = Specifies the maximum number of bean instances that are allowed to exist for each MDB deployment. Default value is 10.
portlet.openejb.help.jndiname = JNDI Names
-portlet.openejb.help.jndinamedesc = Comma separated list of JNDI names for the EJB.
+portlet.openejb.help.jndinamedesc = Comma-separated list of JNDI names for the EJB.
portlet.openejb.help.ki = Known implementations
portlet.openejb.help.ki1 = org.apache.openejb.core.stateful.RAFPassivater
portlet.openejb.help.ki2 = org.apache.openejb.core.stateful.SimplePassivater
@@ -57,7 +57,7 @@
portlet.openejb.help.mli = MessageListenerInterface
portlet.openejb.help.mlidesc = Specifies the message listener interface handled by this container. Default value is javax.jms.MessageListener.
portlet.openejb.help.passivator = Passivator
-portlet.openejb.help.passivatordesc = The passivator is responsible for writing beans to disk at passivation time. Different passivators can be used by setting this property to the fully qualified class name of the PassivationStrategy implementation. The passivator is not responsible for invoking any callbacks or other processing, its only responsibly is to write the bean state to disk.
+portlet.openejb.help.passivatordesc = The passivator is responsible for writing beans to disk at passivation time. Different passivators can be used by setting this property to the fully qualified class name of the PassivationStrategy implementation. The passivator is not responsible for invoking any callbacks or other processing. Its only responsibility is to write the bean state to disk.
portlet.openejb.help.primarykeyclass = Primary Key Class
portlet.openejb.help.primarykeyclassdesc = Primary Key class of the EJB(if any).
portlet.openejb.help.primarykeyfield = Primary Key Field
@@ -69,17 +69,17 @@
portlet.openejb.help.sei = Service EndPoint Interface
portlet.openejb.help.seidesc = Service Endpoint Interface if the stateless EJB is exposed as a web service.
portlet.openejb.help.sfpoolsize = PoolSize
-portlet.openejb.help.sfpoolsizedesc = Specifies the size of the bean pools for this stateful SessionBean container.Default value is 1000.
+portlet.openejb.help.sfpoolsizedesc = Specifies the size of the bean pools for this stateful SessionBean container. Default value is 1000.
portlet.openejb.help.sftimeout = TimeOut
-portlet.openejb.help.sftimeoutdesc = Specifies the time to wait between invocations. This value is measured in minutes. A value of 5 would result in a time-out of 5 minutes between invocations.A value of zero would mean no timeout.Default value is 20.
+portlet.openejb.help.sftimeoutdesc = Specifies the time to wait between invocations. This value is measured in minutes. A value of 5 results in a time-out of 5 minutes between invocations. A value of zero means no timeout. Default value is 20.
portlet.openejb.help.slpoolsize = PoolSize
portlet.openejb.help.slpoolsizedesc = Specifies the size of the bean pools for this stateless SessionBean container. Default value is 10.
portlet.openejb.help.sltimeout = TimeOut
-portlet.openejb.help.sltimeoutdesc = Specifies the time to wait between invocations. This value is measured in milliseconds. A value of 5 would result in a time-out of 5 milliseconds between invocations.A value of zero would mean no timeout.Default value is 0.
+portlet.openejb.help.sltimeoutdesc = Specifies the time to wait between invocations. This value is measured in milliseconds. A value of 5 results in a time-out of 5 milliseconds between invocations. A value of zero means no timeout. Default value is 0.
portlet.openejb.help.statefulcontainer = Stateful Container
portlet.openejb.help.statelesscontainer = Stateless Container
portlet.openejb.help.strictpooling = StrictPooling
-portlet.openejb.help.strictpoolingdesc = StrictPooling tells the container what to do when the pool reaches it's maximum size and there are incoming requests that need instances.With strict pooling, requests will have to wait for instances to become available. The pool size will never grow beyond the the set PoolSize value.Without strict pooling, the container will create temporary instances to meet demand. The instances will last for just one method invocation and then are removed. Default value is true.
+portlet.openejb.help.strictpoolingdesc = StrictPooling tells the container what to do when the pool reaches its maximum size and there are incoming requests that need instances. With strict pooling, requests will have to wait for instances to become available. The pool size will never grow beyond the the set PoolSize value. Without strict pooling, the container will create temporary instances to meet demand. The instances will last for just one method invocation and then are removed. Default value is true.
portlet.openejb.help.title = The EJB Server portlet allows you to see the different OpenEJB containers deployed on the server. It allows you to set the configurable attributes of those containers as well as view information on the EJBs that are deployed on that container.
portlet.openejb.view.beanclassname = Bean Class Name
portlet.openejb.view.boolean = The value of {0} should be either true or false.
@@ -101,7 +101,7 @@
portlet.openejb.view.primarykeyclass = Primary Key Class
portlet.openejb.view.primarykeyfield = Primary Key Field
portlet.openejb.view.remoteinterface = Remote Interface
-portlet.openejb.view.restart = Please restart the openejb configuration for the changes to take effect.
+portlet.openejb.view.restart = Restart the openejb configuration for the changes to take effect.
portlet.openejb.view.sepinterface = Service EndPoint Interface
portlet.openejb.view.unchanged = An unexpected error has occurred and the value cannot be set.
portlet.openejb.view.unrestarted = The openejb configuration should be restarted for the changes that were made to the fields to take effect. The changed fields are now shown in red color.
Propchange: geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties Mon Dec 7 08:10:25 2009
@@ -16,7 +16,7 @@
#=====================================================================
plancreator.archive.archive = Archive
-plancreator.archive.archiveErr = The archive you provided is not a WAR. Please note that only WARs are supported as of now.
+plancreator.archive.archiveErr = The archive you provided is not a WAR. Only WARs are supported as of now.
plancreator.archive.config = Configure
plancreator.common.action = Action
plancreator.common.add = Add
@@ -49,21 +49,21 @@
plancreator.env.checked = CHECKED
plancreator.env.classpathSetting = Classpath Settings
plancreator.env.context = Web Context Root
-plancreator.env.contextDisc = This is the first part of the URL used to access the Web application by the client. For example, if the context-root is entered as "HelloWorld", then a typical URL to the application would start with "http://host:port/HelloWorld/".
+plancreator.env.contextDisc = This is the first part of the URL used to access the Web application by the client. For example, if the context-root is entered as "HelloWorld", a typical URL to the application would start with "http://host:port/HelloWorld/".
plancreator.env.desc = Defaults in this page should suffice for typical scenarios.
-plancreator.env.groupId = Group Id
-plancreator.env.groupIdDesc = A name identifying a group of related modules. This may be a project name, a company name, etc. The important thing is that each artifactID should be unique within the group.
+plancreator.env.groupId = Group ID
+plancreator.env.groupIdDesc = A name identifying a group of related modules. This might be a project name, a company name, etc. The important thing is that each artifactID must be unique within the group.
plancreator.env.hiddenClasses = Hidden Classes
-plancreator.env.hiddenClassesDesc = List packages or classes that may be in a parent class loader, but should not be exposed from there to the Web application. This is typically used when the Web plication wants to use a different version of a library than that of it's parent configuration (or Geronimo itself) uses. Separate multiple package/class names with a semicolon ';'
+plancreator.env.hiddenClassesDesc = List packages or classes that might be in a parent class loader, but should not be exposed from there to the Web application. This is typically used when the Web application wants to use a different version of a library than that of its parent configuration (or Geronimo itself) uses. Separate multiple package/class names with a semicolon ';'
plancreator.env.id = Web Application Identity
-plancreator.env.idDesc = Every module in Geronimo is uniquely identified by it's ModuleID which consists of four components: groupId/artifactId/version/type. Example: "org.apache.geronimo.plugins/plancreator-tomcat/2.1/car".
+plancreator.env.idDesc = Every module in Geronimo is uniquely identified by its ModuleID which consists of four components: groupId, artifactId, version, and type. Example: "org.apache.geronimo.plugins/plancreator-tomcat/2.1/car".
plancreator.env.inverseClassLoading = Inverse Class Loading
plancreator.env.inverseClassLoadingDesc = Normally (if this element is not checked), the module's class loader will work normally - classes will be loaded from the parent class loader if available before checking the current class loader. If this element is checked, that behavior is reversed and the current class loader will always be checked first before looking in the parent class loader. This is often enabled to give the JARs in WEB-INF/lib precedence over anything that might be in a parent class loader.
plancreator.env.nonOverridableClass = Non Overridable Classes
-plancreator.env.nonOverridableClassDesc = List packages or classes that the Web application should always load from a parent class loader, and never load from WEB-INF/lib or WEB-INF/classes. This might be used to force a Web application to share the same instance of a common library with other Web applications, even if they each include it in their own WAR. Separate multiple package/class names with a semicolon ';'
+plancreator.env.nonOverridableClassDesc = List packages or classes that the Web application should always load from a parent class loader, and never load from WEB-INF/lib or WEB-INF/classes. This might be used to force a Web application to share the same instance of a common library with other Web applications, even if they each include it in their own WAR. Separate multiple package/class names with a semicolon ';'
plancreator.env.title = <b>WAR - Environment</b> -- Configure Web Application Identity and Class Path
plancreator.env.type = Type
-plancreator.env.typeDesc = A module's type is normally either CAR (for a system module) or the file extension for an application module (ear,war,jar,etc).
+plancreator.env.typeDesc = A module's type is normally either CAR (for a system module) or the file extension for an application module (ear,war,jar,and so on).
plancreator.env.version = Version
plancreator.env.versionDesc = Version number for the module.
plancreator.reference.desc = Map the references declared in your Web application to specific items available in the server environment. References declared in your web-app (ex. EJB, EJB Local, JDBC Connection Pool, JavaMail Session, JMS Connection Factory and JMS Destination references) are shown below to the left and the resources (available in the server environment) to which they can be linked are shown to the right.
@@ -85,10 +85,10 @@
plancreator.reference.jmsConnReference = JMS Connection Factory References
plancreator.reference.jmsRef = JMS Ref
plancreator.reference.jmsReference = JMS Destination References
-plancreator.reference.resolveErr = Some of the references are not resolved. Please resolve them and only then press Next button.
+plancreator.reference.resolveErr = Some of the references are not resolved. Resolve them and only then press Next button.
plancreator.reference.title = <b>WAR - References</b> -- Resolve EJB, EJB Local, JDBC Connection Pool, JavaMail Session, JMS Connection Factory, JMS Destination and Web Service References
plancreator.reference.tree = EAR tree goes here
-plancreator.reference.wsDesc = Service references declared in your application are shown below to the left. If the WSDL doesn't contain the port information to contact the service or if that information is ambiguous, then resolve the service-ref by clicking on "Add Port".
+plancreator.reference.wsDesc = Service references declared in your application are shown below to the left. If the WSDL doesn't contain the port information to contact the service or if that information is ambiguous, resolve the service-ref by clicking on "Add Port".
plancreator.reference.wsRef = Service Ref Name
plancreator.reference.wsReference = Web Service References
plancreator.security.advancedSetting = Advanced Settings
@@ -112,9 +112,9 @@
plancreator.security.role = Role
plancreator.security.roleMapping = Security Role Mappings
plancreator.security.roleMappingDesc = Security roles declared in web.xml are shown below to the left. Map them to specific principals present in Geronimo's security realms by adding Principals, Login Domain Principals, Realm Principals and/or Distinguished Names.
-plancreator.security.roleMappingErr = Please enter a unique principal name for this role
+plancreator.security.roleMappingErr = Enter a unique principal name for this role
plancreator.security.roleTree = Security roles tree
-plancreator.security.runAsSubjectDesc = The run-as-subject is required when the module is to continue as if run by the specified subject when constrained to the specified role.
+plancreator.security.runAsSubjectDesc = The run-as-subject is required when the module that is constrained to the specified role continues to be run by the specified subject.
plancreator.security.runAsSubjectsTree = Run-as-subjects tree
plancreator.security.securityRealmName = Security Realm Name
plancreator.security.securityRealmNameDesc = Select the Geronimo security realm that will authenticate user logins.
Modified: geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:10:25 2009
@@ -19,10 +19,10 @@
Plan\ Creator = Plan Creator
-errorMsg01 = The archive you provided is not a WAR. Please note that only WARs are supported as of now.
+errorMsg01 = The archive you provided is not a WAR. Only WARs are supported as of now.
errorMsg02 = Deployment failed.
-errorMsg03 = Some of the references are not resolved. Please resolve them and only then press Next button.
+errorMsg03 = Some of the references are not resolved. Resolve them and only then press Next button.
infoMsg01 = The application was successfully deployed.<br/>The application was successfully started.
Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:10:25 2009
@@ -29,14 +29,14 @@
Run\ SQL = Run SQL
-sysdb.errorMsg01 = Error encountered while creating database.
-sysdb.errorMsg02 = Error encountered while closing database connection.
-sysdb.errorMsg03 = Error encountered while shutting down database.
-sysdb.errorMsg04 = Error encountered while backing up database.
-sysdb.errorMsg05 = Error encountered while renaming database folder.
-sysdb.errorMsg06 = Error encountered while deleting database.
-sysdb.errorMsg07 = SQL command can't be empty.
-sysdb.errorMsg08 = Error encountered while executing SQL command(s).
+sysdb.errorMsg01 = An error encountered while creating database.
+sysdb.errorMsg02 = An error encountered while closing database connection.
+sysdb.errorMsg03 = An error encountered while shutting down database.
+sysdb.errorMsg04 = An error encountered while backing up database.
+sysdb.errorMsg05 = An error encountered while renaming database folder.
+sysdb.errorMsg06 = An error encountered while deleting database.
+sysdb.errorMsg07 = SQL command cannot be empty.
+sysdb.errorMsg08 = An error encountered while executing SQL command(s).
sysdb.errorMsg09 = Unable to deploy: {0}.
sysdb.errorMsg10 = Unable to load driver {0}.
sysdb.errorMsg11 = The import operation failed!
Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties Mon Dec 7 08:10:25 2009
@@ -23,11 +23,11 @@
Database\ Pools = æ°æ®åºè¿æ¥æ±
-Derby\ Log\ Viewer = Derbyæ¥å¿æ¥çå¨
+Derby\ Log\ Viewer = Derby æ¥å¿æ¥çå¨
Embedded\ DB = å
ç½®æ°æ®åº
-Run\ SQL = è¿è¡SQL
+Run\ SQL = è¿è¡ SQL
sysdb.errorMsg01 = å建æ°æ®åºæ¶éå°é误ã
sysdb.errorMsg02 = å
³éæ°æ®åºè¿æ¥æ¶éå°é误ã
@@ -35,13 +35,13 @@
sysdb.errorMsg04 = å¤ä»½æ°æ®åºæ¶éå°é误ã
sysdb.errorMsg05 = éå½åæ°æ®åºæ件夹æ¶éå°é误ã
sysdb.errorMsg06 = å é¤æ°æ®åºæ¶éå°é误ã
-sysdb.errorMsg07 = 空SQLå½ä»¤ã
-sysdb.errorMsg08 = æ§è¡SQLå½ä»¤æ¶éå°é误ã
+sysdb.errorMsg07 = 空 SQ Lå½ä»¤ã
+sysdb.errorMsg08 = æ§è¡ SQL å½ä»¤æ¶éå°é误ã
sysdb.errorMsg09 = æ æ³é¨ç½²:{0}ã
sysdb.errorMsg10 = æ æ³å 载驱å¨{0}ã
sysdb.errorMsg11 = 导å
¥è¿æ¥æ± 失败ï¼
sysdb.infoMsg01 = å·²å建æ°æ®åºï¼<b>{0}</b>ã
sysdb.infoMsg02 = å·²å é¤æ°æ®åºï¼<b>{0}</b>ã
-sysdb.infoMsg03 = SQLå½ä»¤æ§è¡æåã
+sysdb.infoMsg03 = SQL å½ä»¤æ§è¡æåã
sysdb.infoMsg04 = è¿æ¥å°{0}ã
sysdb.warnMsg01 = ä¸åå¨é¢å®ä¹çæ°æ®åºè¿æ¥æ± ã
Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties Mon Dec 7 08:10:25 2009
@@ -20,8 +20,8 @@
dbwizard.basicParams.driverConnectionProperties = Driver Connection Properties
dbwizard.basicParams.host = Host
dbwizard.basicParams.port = Port
-dbwizard.basicParams.propertyExp = A property used to connect to {0}. May be optional (see JDBC driver documentation).
-dbwizard.basicParams.seeDocumentation = See the documentation for your JDBC driver.
+dbwizard.basicParams.propertyExp = A property used to connect to {0}. This property can be optional. See JDBC driver documentation.
+dbwizard.basicParams.seeDocumentation = See the JDBC documentation for your JDBC driver.
dbwizard.basicParams.title = <b>Create Database Pool</b> -- Step 2: Select Driver, JAR, Parameters
dbwizard.basicParams.typicalJDBCURL = Typical JDBC URL
dbwizard.basicParams.unableToLoadDriver = Unable to load driver from selected JARs!
@@ -47,7 +47,7 @@
dbwizard.common.driverTransactionTypes = Type of transactions that this connection pool supports.
dbwizard.common.edit = Edit
dbwizard.common.editSettings = Edit Settings
-dbwizard.common.emptyText = The focussed field must not be empty.
+dbwizard.common.emptyText = The focussed field cannot be empty.
dbwizard.common.finish = Finish
dbwizard.common.idleTimeout = Idle Timeout
dbwizard.common.import = {0} Import
@@ -55,7 +55,7 @@
dbwizard.common.importFromWebLogic = Import from WebLogic 8.1
dbwizard.common.inMilliseconds = in milliseconds
dbwizard.common.inMinutes = in minutes
-dbwizard.common.maxNoOfCon = The maximum number of connections in the pool. The default is 10.
+dbwizard.common.maxNoOfCon = The maximum number of connections in the pool. The default value is 10.
dbwizard.common.name = Name
dbwizard.common.next = Next
dbwizard.common.passwordMismatch = Password does not match.
@@ -78,7 +78,7 @@
dbwizard.confirmURL.maxNoOfCon = The maximum number of connections in the pool. Leave blank for default.
dbwizard.confirmURL.minimumNoOfCon = The minimum number of connections in the pool. Leave blank for default.
dbwizard.confirmURL.title = <b>Create Database Pool</b> -- Step 3: Final Pool Configuration
-dbwizard.downloadStatus.summary = This page monitors the driver download progress.
+dbwizard.downloadStatus.summary = This page shows the driver download progress.
dbwizard.downloadStatus.title = <b>Create Database Pool</b> -- Driver Download
dbwizard.edit.basicConProperties = Basic Connection Properties
dbwizard.edit.blockingTimeoutExp = The length of time a caller will wait for a connection. The default is 5000.
@@ -91,10 +91,10 @@
dbwizard.edit.maxNoOfCon = The maximum number of connections in the pool. The default is 10.
dbwizard.edit.minimumNoOfCon = The minimum number of connections in the pool. The default is 0.
dbwizard.edit.poolName = Pool Name
-dbwizard.edit.poolNameExp = A name that is different than the name for any other database pools in the server (no spaces in the name please).
+dbwizard.edit.poolNameExp = A name that is different than the name for any other database pools in the server. Do not type spaces in the pool name.
dbwizard.edit.poolType = Pool Type
-dbwizard.edit.seeDocumentation = See the documentation for your JDBC driver.
-dbwizard.edit.seeLog = see the log for details
+dbwizard.edit.seeDocumentation = See the JDBC documentation for your JDBC driver.
+dbwizard.edit.seeLog = See the log for details
dbwizard.edit.summary = This page edits an existing database pool.
dbwizard.edit.unableToLoadDriver = Unable to load driver from selected JARs!
dbwizard.importStatus.currentPools = Current Pools in Server
@@ -103,16 +103,16 @@
dbwizard.importStatus.importStatus = Import Status
dbwizard.importStatus.originalJNDI = Original JNDI
dbwizard.importStatus.originalName = Original Name
-dbwizard.importStatus.summary = The list of recognized database pools appears below. You can deploy any pools to Geronimo that were configured as plain JDBC pools, or XA pools where Geronimo has a supported XA adapter. Below the pool list is the list of status messages from the import process.
+dbwizard.importStatus.summary = The following list shows recognised database pools. You can deploy any pools to Geronimo that were configured as plain JDBC pools, or XA pools where Geronimo has a supported XA adapter. Below the pool list is the list of status messages from the import process.
dbwizard.importStatus.title = <b>Import Database Pools</b> -- Step 2: Review Imported Data
dbwizard.importUpload.aboutWebLogic = If WebLogic 8.1 is installed on the same machine as Geronimo, and the WebLogic domain directory is readable by the user running Geronimo, you can also point directly to the WebLogic installation and domain directories. This has the advantage that the import process can read the database passwords, whereas if you just import a <tt>config.xml</tt> above you'll need to re-enter all the passwords.
dbwizard.importUpload.alternateImport = Alternate {0} Import
dbwizard.importUpload.domainDirectoryPath = Domain directory path
-dbwizard.importUpload.domainDirectoryPathExp = Please enter the full path to the WebLogic domain directory (containing the <tt>config.xml</tt> file) for your WebLogic domain .
-dbwizard.importUpload.enterFullPath = Please enter the full path to the <tt>weblogic81/server/lib</tt> directory for your WebLogic 8.1 installation .
-dbwizard.importUpload.path = path
-dbwizard.importUpload.pleaseSelect = Please select the
-dbwizard.importUpload.summary = This page starts the process of importing database pools from another application server. To do the import, you'll need to upload a configuration file from the other server using the fields below. After that, we'll convert the values we can, and ask you to confirm the configuration for each pool we find in the configuration.
+dbwizard.importUpload.domainDirectoryPathExp = Enter the full path to the WebLogic domain directory (containing the <tt>config.xml</tt> file) for your WebLogic domain .
+dbwizard.importUpload.enterFullPath = Enter the full path to the <tt>weblogic81/server/lib</tt> directory for your WebLogic 8.1 installation .
+dbwizard.importUpload.path = Path
+dbwizard.importUpload.pleaseSelect = Select the
+dbwizard.importUpload.summary = This page starts the process of importing database pools from another application server. To do the import, you must upload a configuration file from the other server using the fields below. Geronimo server will convert the configuration information into Geronimo specific values, and ask you to confirm the configuration for each pool in the configuration.
dbwizard.importUpload.title = <b>Import Database Pools</b> -- Step 1: Upload Configuration File
dbwizard.list.createPool = Create a new database pool
dbwizard.list.deployedAs = Deployed As
@@ -158,14 +158,14 @@
dbwizard.tranql-connector-db2-xa.PortNumber = Port Number
dbwizard.tranql-connector-db2-xa.PortNumberExp = Specifies the port number the remote database server is listening on for incoming connections. The default for a DB2 server is 50000.
dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSize = PreparedStatement Cache Size
-dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = PreparedStatementCacheSize tells the driver how many prepared statements should be associated with each connection. The default is no statement caching.
+dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = PreparedStatementCacheSize specifies the driver how many prepared statements should be associated with each connection. The default is no statement caching.
dbwizard.tranql-connector-db2-xa.ResultSetHoldability = ResultSetHoldability
dbwizard.tranql-connector-db2-xa.ResultSetHoldabilityExp = ResultSetHoldability has two possible values: HOLD_CURSORS_OVER_COMMIT and CLOSE_CURSORS_AT_COMMIT. Either of these values can be specified with any valid combination of resultSetConcurrency and resultSetHoldability. The value that you set overrides the default holdability for the connection.<br/><br/>HOLD_CURSORS_OVER_COMMIT = 1<br/>CLOSE_CURSORS_AT_COMMIT = 2
dbwizard.tranql-connector-db2-xa.ServerName = Server Name
-dbwizard.tranql-connector-db2-xa.ServerNameExp = ServerName is the name / IP address of the host which the DB2 driver needs to connect to. There is no default.
+dbwizard.tranql-connector-db2-xa.ServerNameExp = ServerName is the name or IP address of the host that the DB2 driver needs to connect to. There is no default value.
dbwizard.tranql-connector-db2-xa.TraceFile = Trace File
dbwizard.tranql-connector-db2-xa.TraceFileAppend = TraceFileAppend
-dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = Specifies whether to append to or overwrite the file that is specified by the traceFile property. The data type of this property is boolean. The default is false, which means that the file that is specified by the traceFile property is overwritten.
+dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = TraceFileAppend specifies whether to append to or overwrite the file that is specified by the traceFile property. The data type of this property is boolean. The default value is false, which means that the file that is specified by the traceFile property is overwritten.
dbwizard.tranql-connector-db2-xa.TraceFileExp = Name of the tracefile to place trace records into.
dbwizard.tranql-connector-db2-xa.UserName = User Name
dbwizard.tranql-connector-db2-xa.UserNameExp = The name of the userID used to connect to the remote database server.
@@ -336,48 +336,48 @@
dbwizard.tranql-connector-postgresql-xa.UserName = User Name
dbwizard.tranql-connector-postgresql-xa.UserNameExp = Username used to establish the physical connection.
dbwizard.tranql-connector-sqlserver2000-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = The name of the SQL Server database to which you want to connect.
+dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = The name of the SQL Server database to connect to.
dbwizard.tranql-connector-sqlserver2000-xa.Password = Password
dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = The case-insensitive password used to connect to your SQL Server database.
dbwizard.tranql-connector-sqlserver2000-xa.PortNumber = Port Number
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = The TCP port of the SQL Server, default 1433.
+dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = The TCP port of the SQL Server, the default is 1433.
dbwizard.tranql-connector-sqlserver2000-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}. Consult microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
+dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}. Refer to Microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
dbwizard.tranql-connector-sqlserver2000-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Consult microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slighty slower under some circumstances.
+dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Refer to Microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slighty slower under some circumstances.
dbwizard.tranql-connector-sqlserver2000-xa.ServerName = Server Name
dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = The IP address of the SQL Server.
dbwizard.tranql-connector-sqlserver2000-xa.UserName = User Name
-dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = The case-insensitive user name used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = The case-insensitive username used to connect to your SQL Server database.
dbwizard.tranql-connector-sqlserver2005-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = The name of the SQL Server database to which you want to connect.
+dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = The name of the SQL Server database to connect to.
dbwizard.tranql-connector-sqlserver2005-xa.Password = Password
dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = The case-insensitive password used to connect to your SQL Server database.
dbwizard.tranql-connector-sqlserver2005-xa.PortNumber = Port Number
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = The TCP port of the SQL Server, default 1433.
+dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = The TCP port of the SQL Server, the default is 1433.
dbwizard.tranql-connector-sqlserver2005-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}. Consult microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
+dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}. Refer to Microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
dbwizard.tranql-connector-sqlserver2005-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Consult microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slighty slower under some circumstances.
+dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Refer to Microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slightly slower under some circumstances.
dbwizard.tranql-connector-sqlserver2005-xa.ServerName = Server Name
dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = The IP address of the SQL Server.
dbwizard.tranql-connector-sqlserver2005-xa.UserName = User Name
-dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = The case-insensitive user name used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = The case-insensitive username used to connect to your SQL Server database.
dbwizard.usage.applicationCode = Application Code
dbwizard.usage.geronimo_webExp = <p>To point the resource reference to a specific database pool in Geronimo, the web application needs to have a <tt>geronimo-web.xml</tt> deployment plan. That may be packaged in the WAR in the <tt>WEB-INF</tt> directory, or it may be provided separately on the command line to the deploy tool. The <tt>geronimo-web.xml</tt> plan should have a <tt>dependency</tt> element pointing to the database pool module, and a <tt>resource-ref</tt> block corresponding to the <tt>web.xml</tt> <tt>resource-ref</tt> above, which maps the resource reference to a specific database pool. In that block, the <tt>ref-name</tt> must match the <tt>res-ref-name</tt> from the <tt>web.xml</tt> (above) and the <tt>resource-link</tt> must point to the database pool by name.</p> <p><i>If you have only one pool named {0} deployed in Geronimo, you can point to it like this.</i></p>
dbwizard.usage.moreThanOnePool = If you have more than one pool named {0} (for example, two dependencies that <b>each</b> include a component named {1}), then you can specify the pool to use more explicitly like this:
dbwizard.usage.resource_refSection = The <tt>web.xml</tt> should have a <tt>resource-ref</tt> section declaring the database pool, like this. Note the <tt>res-ref-name</tt>, which is what we'll need to map the reference to a pool, and also what the application will need in order to access the pool.
dbwizard.usage.searchOnlyOne = That will search for a pool named {0} in the current application and any modules listed as dependencies (and their dependencies, etc.).
-dbwizard.usage.title = This page talks about how to use the database pool {0} from a J2EE application. The example here is a web application, but other application modules would work in the same way.
+dbwizard.usage.title = This page shows how to use the database pool {0} from a Java EE application. The example here is a Web application, but other application modules would work in the same way.
dbwizard.usage.usingInCode = To get a reference to the database pool, your application can use code like this. Note that the JNDI lookup string is <tt>java:comp/env/</tt> plus the <tt>res-ref-name</tt> used in <tt>web.xml</tt> (above).
-derbylogmanager.help.title = This portlet views the log file for Geronimo's internal database, Derby.
+derbylogmanager.help.title = This portlet shows the log file for Geronimo's internal database, Derby.
derbylogmanager.view.Lines = Lines
derbylogmanager.view.containingText = Containing text
derbylogmanager.view.filterLog = Filter Log
derbylogmanager.view.filterResults = Filter results
derbylogmanager.view.integer = The focussed field must be an integer.
-derbylogmanager.view.matchCriterial = {0} total message(s) in log file. {1} matched your criteria
+derbylogmanager.view.matchCriterial = {0} total message(s) in log file. {1} matched your criteria.
derbylogmanager.view.maxResults = Max Results
derbylogmanager.view.noEntries = No entries found with the specified criteria.
derbylogmanager.view.numberOfResultsCapped = number of results capped
@@ -408,7 +408,7 @@
internaldb.common.driverName = Driver Name
internaldb.common.driverVersion = Driver Version
internaldb.common.empty = Empty
-internaldb.common.emptyText = The focussed field must not be empty.
+internaldb.common.emptyText = The focussed field cannot be empty.
internaldb.common.etc = Etc
internaldb.common.functions = Functions
internaldb.common.note = Note
Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties Mon Dec 7 08:10:25 2009
@@ -20,18 +20,18 @@
dbwizard.basicParams.driverConnectionProperties = 驱å¨ç¨åºè¿æ¥å±æ§
dbwizard.basicParams.host = 主æº
dbwizard.basicParams.port = 端å£
-dbwizard.basicParams.propertyExp = ç¨æ¥è¿æ¥ {0} çå±æ§ãå¯è½æ¯å¯éçï¼è¯·åèJDBC 驱å¨çææ¡£ï¼
-dbwizard.basicParams.seeDocumentation = 请åèJDBC 驱å¨çææ¡£
+dbwizard.basicParams.propertyExp = ç¨æ¥è¿æ¥ {0} çå±æ§ã该å±æ§å¼å¯éï¼è¯·åè JDBC 驱å¨çææ¡£ï¼
+dbwizard.basicParams.seeDocumentation = 请åè JDBC 驱å¨çææ¡£
dbwizard.basicParams.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤2: éæ©é©±å¨ç¨åºï¼JARï¼åæ°
-dbwizard.basicParams.typicalJDBCURL = å
¸åçJDBC URL
+dbwizard.basicParams.typicalJDBCURL = å
¸åç JDBC URL
dbwizard.basicParams.unableToLoadDriver = ä¸è½ä»éä¸ç JAR å
ä¸å 载驱å¨!
dbwizard.common.DBPassword = æ°æ®åºå¯ç
dbwizard.common.DBPasswordExp = ç¨äºè¿æ¥æ°æ®åºçå¯ç
dbwizard.common.DBUserName = æ°æ®åºç¨æ·å
dbwizard.common.DBUserNameExp = ç¨äºè¿æ¥æ°æ®åºçç¨æ·å
-dbwizard.common.JDBCConnectURL = JDBCè¿æ¥URL
-dbwizard.common.JDBCDriverClass = JDBC驱å¨ç±»
-dbwizard.common.URLFits = ç¡®ä¿çæçURL符åä½ çJDBC驱å¨çè¯æ³ã
+dbwizard.common.JDBCConnectURL = JDBC è¿æ¥ URL
+dbwizard.common.JDBCDriverClass = JDBC 驱å¨ç±»
+dbwizard.common.URLFits = ç¡®ä¿çæç URL 符åä½ ç JDBC 驱å¨çè¯æ³ã
dbwizard.common.actions = æä½
dbwizard.common.blockingTimeout = é»å¡è¶
æ¶
dbwizard.common.cancel = åæ¶
@@ -43,7 +43,7 @@
dbwizard.common.deploy = é¨ç½²
dbwizard.common.downloadDriver = ä¸è½½é©±å¨
dbwizard.common.driverJAR = é©±å¨ JAR
-dbwizard.common.driverJARExplanation = è¿æ¥å°æ°æ®åºæ¶æéè¦ç JAR å
ãä½¿ç¨ CTRL æè
SHIFT é®éæ©å¤ä¸ª JAR å
ã<br>è¿äº JAR å
åºè¯¥å·²è¢«å®è£
å¨GERONIMO/repository/ç®å½ä¸ï¼ï¼æè
+dbwizard.common.driverJARExplanation = è¿æ¥å°æ°æ®åºæ¶æéè¦ç JAR å
ãä½¿ç¨ CTRL æè
SHIFT é®éæ©å¤ä¸ª JAR å
ã<br>è¿äº JAR å
åºè¯¥å·²è¢«å®è£
å¨ GERONIMO/repository/ ç®å½ä¸ï¼ï¼æè
dbwizard.common.driverTransactionTypes = 该è¿æ¥æ± æ¯æçäºå¡ç±»å
dbwizard.common.edit = ç¼è¾
dbwizard.common.editSettings = ç¼è¾è®¾ç½®
@@ -51,11 +51,11 @@
dbwizard.common.finish = å®æ
dbwizard.common.idleTimeout = 空é²æ¶é´
dbwizard.common.import = ä»{0}导å
¥
-dbwizard.common.importFromJBoss = ä»JBoss 4导å
¥
-dbwizard.common.importFromWebLogic = ä»WebLogic 8.1导å
¥
+dbwizard.common.importFromJBoss = ä» JBoss 4导å
¥
+dbwizard.common.importFromWebLogic = ä» WebLogic 8.1导å
¥
dbwizard.common.inMilliseconds = 毫ç§
dbwizard.common.inMinutes = åé
-dbwizard.common.maxNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ç®ãé»è®¤å¼æ¯10ã
+dbwizard.common.maxNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ç®ãé»è®¤å¼æ¯ 10ã
dbwizard.common.name = åå
dbwizard.common.next = ä¸ä¸æ¥
dbwizard.common.passwordMismatch = å¯ç ä¸å¹é
ã
@@ -70,30 +70,30 @@
dbwizard.common.state = ç¶æ
dbwizard.common.testConnection = æµè¯è¿æ¥
dbwizard.common.transactionType = äºå¡ç±»å
-dbwizard.common.usingPoolWizard = 使ç¨Geronimoæ°æ®åºè¿æ¥æ± å导
+dbwizard.common.usingPoolWizard = ä½¿ç¨ Geronimo æ°æ®åºè¿æ¥æ± å导
dbwizard.confirmURL.blockingTimeoutExp = æ¯æ¬¡è°ç¨æéçå¾
çæé¿æ¶é´ãç空表示使ç¨é»è®¤å¼ã
dbwizard.confirmURL.driverStatus = 驱å¨ç¶æ
dbwizard.confirmURL.idleTimeoutExp = è¿æ¥å¨å
³éä¹åè½æå¤é¿ç©ºé²æ¶é´ãç空表示使ç¨é»è®¤å¼ã
dbwizard.confirmURL.loadedSuccessfully = æåå 载驱å¨
dbwizard.confirmURL.maxNoOfCon = è¿æ¥æ± ä¸æ大è¿æ¥æ°ãç空表示使ç¨é»è®¤å¼ã
dbwizard.confirmURL.minimumNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ãç空表示使ç¨é»è®¤å¼ã
-dbwizard.confirmURL.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤3: è¿æ¥æ± æåé
ç½®
+dbwizard.confirmURL.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤ 3: è¿æ¥æ± æåé
ç½®
dbwizard.downloadStatus.summary = è¿ä¸ªé¡µé¢ç¨äºçæµé©±å¨ç¨åºä¸è½½è¿ç¨ã
dbwizard.downloadStatus.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- ä¸è½½é©±å¨
dbwizard.edit.basicConProperties = è¿æ¥åºæ¬å±æ§
-dbwizard.edit.blockingTimeoutExp = æ¯æ¬¡è°ç¨æéçå¾
çæé¿æ¶é´ãé»è®¤ä¸º5000ã
-dbwizard.edit.errorMsg01 = æ± çæå°å¼å¿
é¡»æ¯ä¸ä¸ªæ°åï¼é»è®¤å¼æ¯0.
-dbwizard.edit.errorMsg02 = æ± çæå°å¼ä¸è½æ¯è´æ°ï¼é»è®¤å¼æ¯0.
-dbwizard.edit.errorMsg03 = æ± çæ大å¼å¿
é¡»æ¯ä¸ä¸ªæ°åï¼é»è®¤å¼æ¯10.
-dbwizard.edit.errorMsg04 = æ± çæ大å¼å¿
须大äº0ï¼é»è®¤å¼æ¯10ã
+dbwizard.edit.blockingTimeoutExp = æ¯æ¬¡è°ç¨æéçå¾
çæé¿æ¶é´ãé»è®¤ä¸º 5000ã
+dbwizard.edit.errorMsg01 = æ± çæå°å¼å¿
é¡»æ¯ä¸ä¸ªæ°åï¼é»è®¤å¼æ¯ 0.
+dbwizard.edit.errorMsg02 = æ± çæå°å¼ä¸è½æ¯è´æ°ï¼é»è®¤å¼æ¯ 0.
+dbwizard.edit.errorMsg03 = æ± çæ大å¼å¿
é¡»æ¯ä¸ä¸ªæ°åï¼é»è®¤å¼æ¯ 10.
+dbwizard.edit.errorMsg04 = æ± çæ大å¼å¿
é¡»å¤§äº 0ï¼é»è®¤å¼æ¯ 10ã
dbwizard.edit.errorMsg05 = æ± çæ大å¼å¿
须大äºæå°å¼ã
-dbwizard.edit.idleTimeoutExp = è¿æ¥å¨å
³éä¹åè½æå¤é¿ç©ºé²æ¶é´ãé»è®¤ä¸º15ã
-dbwizard.edit.maxNoOfCon = è¿æ¥æ± ä¸æ大è¿æ¥æ°ç®ãé»è®¤ä¸º10.
-dbwizard.edit.minimumNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ç®ãé»è®¤ä¸º0ã
+dbwizard.edit.idleTimeoutExp = è¿æ¥å¨å
³éä¹åè½æå¤é¿ç©ºé²æ¶é´ãé»è®¤ä¸º 15ã
+dbwizard.edit.maxNoOfCon = è¿æ¥æ± ä¸æ大è¿æ¥æ°ç®ãé»è®¤ä¸º 10.
+dbwizard.edit.minimumNoOfCon = è¿æ¥æ± ä¸æå°è¿æ¥æ°ç®ãé»è®¤ä¸º 0ã
dbwizard.edit.poolName = è¿æ¥æ± å称
dbwizard.edit.poolNameExp = ä¸ä¸ªä¸åäºæå¡å¨ä¸å
¶å®æ°æ®åºè¿æ¥æ± çå称ï¼å称ä¸è¯·ä¸è¦æç©ºæ ¼ï¼ã
dbwizard.edit.poolType = è¿æ¥æ± ç±»å
-dbwizard.edit.seeDocumentation = 请åèJDBC驱å¨çææ¡£
+dbwizard.edit.seeDocumentation = 请åè JDBC 驱å¨çææ¡£
dbwizard.edit.seeLog = æ¥çæ¥å¿æ件äºè§£è¯¦æ
dbwizard.edit.summary = è¿ä¸ªé¡µé¢ç¨äºç¼è¾å·²åå¨çæ°æ®åºè¿æ¥æ± ã
dbwizard.edit.unableToLoadDriver = ä¸è½ä»éä¸ç JAR å
ä¸å 载驱å¨!
@@ -101,15 +101,15 @@
dbwizard.importStatus.importFailed = 导å
¥è¿æ¥æ± 失败ï¼æè
没æåç°ä»»ä½å¯ç¨çæ°æ®åºè¿æ¥æ± ï¼
dbwizard.importStatus.importMessages = 导å
¥è¿ç¨ä¸çæ¶æ¯
dbwizard.importStatus.importStatus = 导å
¥ç¶æ
-dbwizard.importStatus.originalJNDI = åå§JNDI
+dbwizard.importStatus.originalJNDI = åå§ JNDI
dbwizard.importStatus.originalName = åå§è¿æ¥æ± å称
-dbwizard.importStatus.summary = ä¸è¡¨ååºäºå¯è¯å«åºçæ°æ®åºè¿æ¥æ± ãä½ å¯ä»¥æä»»ä½æ®é JDBC è¿æ¥æ± æè
XA è¿æ¥æ± é¨ç½²å°Geronimoï¼å 为 Geronimo å
å«æ¯æ XA çéé
å¨ãä¸é¢çè¿æ¥æ± å表æ¯ä¸ä¸ªå¯¼å
¥è¿ç¨ä¸çç¶æä¿¡æ¯å表ã
+dbwizard.importStatus.summary = ä¸è¡¨ååºäºå¯è¯å«åºçæ°æ®åºè¿æ¥æ± ãä½ å¯ä»¥æä»»ä½æ®é JDBC è¿æ¥æ± æè
XA è¿æ¥æ± é¨ç½²å° Geronimoï¼å 为 Geronimo å
å«æ¯æ XA çéé
å¨ãä¸é¢çè¿æ¥æ± å表æ¯ä¸ä¸ªå¯¼å
¥è¿ç¨ä¸çç¶æä¿¡æ¯å表ã
dbwizard.importStatus.title = <b>导å
¥æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤2: æ£æ¥å·²å¯¼å
¥æ°æ®
-dbwizard.importUpload.aboutWebLogic = å¦æWebLogic 8.1åGeronimoå®è£
å¨åä¸å°æºå¨ï¼å¹¶ä¸è¿è¡Geronimoçç¨æ·æWebLogicåç®å½ç读åæéçè¯ï¼ä½ ä¹å¯ä»¥ç´æ¥æåWebLogicçå®è£
ååç®å½ãè¿æ ·ç好å¤å¨äºå¯¼å
¥è¿ç¨è½å¤è¯»åæ°æ®åºçå¯ç ï¼èå¦æä½ ä»
ä»
导å
¥ä¸é¢ç<tt>config.xml</tt>ï¼ä½ å°±å¿
é¡»éæ°è¾å
¥ææçå¯ç ã
+dbwizard.importUpload.aboutWebLogic = å¦æ WebLogic 8.1 å Geronimo å®è£
å¨åä¸å°æºå¨ï¼å¹¶ä¸è¿è¡ Geronimo çç¨æ·æ WebLogic åç®å½ç读åæéçè¯ï¼ä½ ä¹å¯ä»¥ç´æ¥æå WebLogic çå®è£
ååç®å½ãè¿æ ·ç好å¤å¨äºå¯¼å
¥è¿ç¨è½å¤è¯»åæ°æ®åºçå¯ç ï¼èå¦æä½ ä»
ä»
导å
¥ä¸é¢ç<tt>config.xml</tt>ï¼ä½ å°±å¿
é¡»éæ°è¾å
¥ææçå¯ç ã
dbwizard.importUpload.alternateImport = {0}å¯é导å
¥é¡¹
dbwizard.importUpload.domainDirectoryPath = åç®å½è·¯å¾
-dbwizard.importUpload.domainDirectoryPathExp = 请è¾å
¥WebLogicåç®å½çå®å
¨è·¯å¾ï¼å
å«<tt>config.xml</tt>æ件ï¼ã
-dbwizard.importUpload.enterFullPath = 请è¾å
¥å°<tt>weblogic81/server/lib</tt>ç®å½çå®å
¨è·¯å¾ã
+dbwizard.importUpload.domainDirectoryPathExp = 请è¾å
¥ WebLogic åç®å½çå®å
¨è·¯å¾ï¼å
å«<tt>config.xml</tt>æ件ï¼ã
+dbwizard.importUpload.enterFullPath = 请è¾å
¥å° <tt>weblogic81/server/lib</tt> ç®å½çå®å
¨è·¯å¾ã
dbwizard.importUpload.path = è·¯å¾
dbwizard.importUpload.pleaseSelect = 请éæ©
dbwizard.importUpload.summary = è¿ä¸ªé¡µé¢å¼å§ä»å
¶å®åºç¨æå¡å¨å¯¼å
¥æ°æ®åºè¿æ¥æ± çè¿ç¨ã为äºå¯¼å
¥è¿æ¥æ± ï¼ä½ éè¦ä½¿ç¨ä¸é¢çå段æ¥ä¸ä¼ å
¶å®æå¡å¨çé
ç½®æ件ãèæ们ä¼å°½é转æ¢è¿äºå¼ãå¹¶è®©ä½ ç¡®è®¤å¨é
ç½®æ件ä¸æ¾å°çæ¯ä¸ªè¿æ¥æ± çé
ç½®ã
@@ -126,18 +126,18 @@
dbwizard.selectDatabase.nameOfPool = æ°æ®åºè¿æ¥æ± å称
dbwizard.selectDatabase.nameOfPoolExplanation = åä¸ä¸ªä¸æå¡å¨ä¸å
¶å®æ°æ®åºè¿æ¥æ± ä¸åçå称ï¼å称ä¸è¯·ä¸è¦æç©ºæ ¼ï¼ã
dbwizard.selectDatabase.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤1: éæ©å称åæ°æ®åº
-dbwizard.selectDownload.otherJDBCDrivers = è¿éæ¯ä½ å¯è½æ³èªå·±ä¸è½½çå
¶å®ä¸äºJDBC驱å¨ï¼åªéè¦ä¿åå®ä»¬å°geronimo/repository/ä¸çæ个å°æ¹å³å¯ï¼
+dbwizard.selectDownload.otherJDBCDrivers = è¿éæ¯ä½ å¯è½æ³èªå·±ä¸è½½çå
¶å®ä¸äº JDBC 驱å¨ï¼åªéè¦ä¿åå®ä»¬å° Geronimo/repository/ ä¸çæ个å°æ¹å³å¯ï¼
dbwizard.selectDownload.selectDriver = éæ©é©±å¨
-dbwizard.selectDownload.selectDriverExp = Geronimoå¯ä»¥èªå¨ä¸ºä½ ä¸è½½ç驱å¨ã
+dbwizard.selectDownload.selectDriverExp = Geronimo å¯ä»¥èªå¨ä¸ºä½ ä¸è½½ç驱å¨ã
dbwizard.selectDownload.selectOtherDatabase = éæ©å
¶å®æ°æ®åº
dbwizard.selectDownload.selectPredefinedDatabase = éæ©"é¢å®ä¹"çæ°æ®åº
-dbwizard.selectDownload.summary = <p>è¿ä¸ªé¡µé¢è®©ä½ èªå¨å°ä¸è½½æ°æ®åºç驱å¨å¨ï¼è¿äºé©±å¨çJARå
ä¸éè¦ç»å½æ注åå³å¨çº¿å¯ç¨ã</p><p><i>å¦æè¿ä¸ªé¡µé¢è±è´¹äºå¾é¿æ¶é´ä¸è½½é©±å¨ï¼æè
å¨ä¸é¢çä¸ææ¡ä¸æ²¡æä»»ä½é©±å¨ï¼é£ä¹è¿å¯è½æå³çä½ å®è£
çGeronimoä¸è½è¿æ¥å°apache.orgæ¥è·å¾æå
³é©±å¨ä¸è½½çé
ç½®æ件ãæ们对è¿å¼èµ·çä¸ä¾¿é常æ±æï¼ä½ å¯ä»¥ç¨åå次å°è¯ï¼æè
æå¨å°å®è£
驱å¨ï¼æ·è´é©±å¨å°geronimo/reposit
ory/ä¸çç®å½ï¼ã</i></p>
+dbwizard.selectDownload.summary = <p>è¿ä¸ªé¡µé¢è®©ä½ èªå¨å°ä¸è½½æ°æ®åºç驱å¨å¨ï¼è¿äºé©±å¨ç JAR å
ä¸éè¦ç»å½æ注åå³å¨çº¿å¯ç¨ã</p><p><i>å¦æè¿ä¸ªé¡µé¢è±è´¹äºå¾é¿æ¶é´ä¸è½½é©±å¨ï¼æè
å¨ä¸é¢çä¸ææ¡ä¸æ²¡æä»»ä½é©±å¨ï¼é£ä¹è¿å¯è½æå³çä½ å®è£
çGeronimoä¸è½è¿æ¥å°apache.orgæ¥è·å¾æå
³é©±å¨ä¸è½½çé
ç½®æ件ãæ们对è¿å¼èµ·çä¸ä¾¿é常æ±æï¼ä½ å¯ä»¥ç¨åå次å°è¯ï¼æè
æå¨å°å®è£
驱å¨ï¼å°é©±å¨å¤å¶å° Geronim
o/repository/ä¸çç®å½ï¼ã</i></p>
dbwizard.selectDownload.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤2: éæ©é©±å¨ï¼JARï¼åæ°
dbwizard.showPlan.addToEAR = æ·»å å°EAR
-dbwizard.showPlan.deployAsPartEAR = ä½ å¯ä»¥é¨ç½²è¿æ¥æ± 为EARçä¸é¨åï¼èä¸æ¯é¨ç½²ä¸ºtop-levelçæ°æ®åºè¿æ¥æ± ãæç
§ä¸é¢çæ¥éª¤å¯ä»¥é¨ç½²è¿æ¥æ± 为EARçä¸é¨åï¼<ol> <li>æ·è´å¹¶ç²å¸é¨ç½²è®¡åå°æ件ä¸</li> <li>ä¿åè¿ä»½é¨ç½²è®¡åæ件å°ä½ çEARç顶å±ç®å½ä¸</li> <li>ä»<tt>GERONIMO_HOME/{0}</tt>ä¸æ·è´RARæ件å°ä½ çEARç顶å±ç®å½ä¸</li> <li>å¨ä½ çEARä¸å建<tt>META-INF/geronimo-application.xml</tt>æ件ï¼å
¶ä¸å
å«ç±»ä¼¼ä¸é¢ç<tt>module</tt>çæ¡ç®ï¼ ï¼æ¿æ¢ææ£ç¡®çRARæ件å
称åé¨ç½²è®¡åæ件çå称ï¼ï¼</li></ol>
+dbwizard.showPlan.deployAsPartEAR = ä½ å¯ä»¥é¨ç½²è¿æ¥æ± 为 EAR çä¸é¨åï¼èä¸æ¯é¨ç½²ä¸º top-level çæ°æ®åºè¿æ¥æ± ãæç
§ä¸é¢çæ¥éª¤å¯ä»¥é¨ç½²è¿æ¥æ± 为EARçä¸é¨åï¼<ol> <li>æ·è´å¹¶ç²å¸é¨ç½²è®¡åå°æ件ä¸</li> <li>ä¿åè¿ä»½é¨ç½²è®¡åæ件å°ä½ çEARç顶å±ç®å½ä¸</li> <li>ä»<tt>GERONIMO_HOME/{0}</tt>ä¸æ·è´RARæ件å°ä½ çEARç顶å±ç®å½ä¸</li> <li>å¨ä½ çEARä¸å建<tt>META-INF/geronimo-application.xml</tt>æ件ï¼å
¶ä¸å
å«ç±»ä¼¼ä¸é¢ç<tt>module</tt>çæ¡ç®ï¼ ï¼æ¿æ¢ææ£ç¡®çRARæ件å
称åé¨ç½²è®¡åæ件çå称ï¼ï¼</li></ol>
dbwizard.showPlan.deployCommand = é¨ç½²å½ä»¤
dbwizard.showPlan.deployPool = é¨ç½²è¿æ¥æ±
-dbwizard.showPlan.deployPoolFromCommandLine = 为äºå¨å½ä»¤è¡ä¸ä½¿ç¨é¨ç½²è®¡åæ¥é¨ç½²è¿æ¥æ± ï¼æ·è´å¹¶ç²å¸ä¸é¢çXMLå°æ件ä¸ï¼å¦ï¼<tt>plan-file.xml</tt>ï¼ä¿åå®ãç¶åæ§è¡ç±»ä¼¼ä¸é¢çå½ä»¤ï¼
+dbwizard.showPlan.deployPoolFromCommandLine = 为äºå¨å½ä»¤è¡ä¸ä½¿ç¨é¨ç½²è®¡åæ¥é¨ç½²è¿æ¥æ± ï¼æ·è´å¹¶ç²å¸ä¸é¢ç XML å°æ件ä¸ï¼å¦ï¼<tt>plan-file.xml</tt>ï¼ä¿åå®ãç¶åæ§è¡ç±»ä¼¼ä¸é¢çå½ä»¤ï¼
dbwizard.showPlan.deploymentPlan = é¨ç½²è®¡å
dbwizard.showPlan.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¾ç¤ºé¨ç½²è®¡å
dbwizard.testConnection.connectedTo = è¿æ¥å°
@@ -146,29 +146,29 @@
dbwizard.testConnection.testAgain = å次æµè¯
dbwizard.testConnection.testError = æµè¯é误
dbwizard.testConnection.testResult = æµè¯ç»æ
-dbwizard.testConnection.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤4: æµè¯è¿æ¥
+dbwizard.testConnection.title = <b>å建æ°æ®åºè¿æ¥æ± </b> -- æ¥éª¤ 4ï¼æµè¯è¿æ¥
dbwizard.tranql-connector-db2-xa.DatabaseName = æ°æ®åºå称
-dbwizard.tranql-connector-db2-xa.DatabaseNameExp = æå®æ°æ®åºæå¡å¨çå称ã该å称ä½ä¸ºè¿æ¥URLçæ°æ®åºé¨åã
+dbwizard.tranql-connector-db2-xa.DatabaseNameExp = æå®æ°æ®åºæå¡å¨çå称ã该å称ä½ä¸ºè¿æ¥ URL çæ°æ®åºé¨åã
dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXa = Downgrade Hold Cursors
dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXaExp = æå®ä¸æææéå
³èçéæ¯å¦ä¼é级
dbwizard.tranql-connector-db2-xa.DriverType = 驱å¨ç±»å
-dbwizard.tranql-connector-db2-xa.DriverTypeExp = ç¨äºå»ºç«å°è¯¥æ°æ®æºçè¿æ¥ç驱å¨ç±»åãå¯è½çå¼æ2å4.é»è®¤å¼æ¯ç±»å4.
+dbwizard.tranql-connector-db2-xa.DriverTypeExp = ç¨äºå»ºç«å°è¯¥æ°æ®æºçè¿æ¥ç驱å¨ç±»åãå¯éç±»åå¼ä¸º 2 æ 4ãé»è®¤å¼æ¯ç±»å4.
dbwizard.tranql-connector-db2-xa.Password = å¯ç
dbwizard.tranql-connector-db2-xa.PasswordExp = \
dbwizard.tranql-connector-db2-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-db2-xa.PortNumberExp = æå®è¿ç«¯æ°æ®åºä¾¦å¬å°æ¥è¿æ¥ç端å£å·ãDB2æå¡å¨é»è®¤ä¸º50000.
+dbwizard.tranql-connector-db2-xa.PortNumberExp = æå®è¿ç«¯æ°æ®åºä¾¦å¬å°æ¥è¿æ¥ç端å£å·ãDB2 æå¡å¨é»è®¤ä¸º50000.
dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSize = PreparedStatementç¼å大å°
dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = åè¯é©±å¨æ¯ä¸ªè¿æ¥åºè¯¥å
³èå¤å°ä¸ªPreparedStatementãé»è®¤å¼æ¯ä¸ä½¿ç¨PreparedStatementç¼åã
dbwizard.tranql-connector-db2-xa.ResultSetHoldability = ResultSetHoldability
dbwizard.tranql-connector-db2-xa.ResultSetHoldabilityExp = ç»æéçå¯ä¿åæ§æ两个å¯éå¼ : HOLD_CURSORS_OVER_COMMIT å CLOSE_CURSORS_AT_COMMIT. ä»»ä½ä¸ä¸ªå¼å¯ä»¥éè¿ resultSetConcurrency å resultSetHoldability çææç»åè¿è¡è®¾ç½®. æ¨æ设置çå¼è®²è¦ç Connection çé»è®¤å¼. <br/><br/>HOLD_CURSORS_OVER_COMMIT = 1<br/>CLOSE_CURSORS_AT_COMMIT = 2
dbwizard.tranql-connector-db2-xa.ServerName = æå¡å¨å称
-dbwizard.tranql-connector-db2-xa.ServerNameExp = DB2驱å¨éè¦è¿æ¥å°ç主æºçå称æè
IPå°åã该项没æé»è®¤å¼ã
-dbwizard.tranql-connector-db2-xa.TraceFile = Traceæ件
+dbwizard.tranql-connector-db2-xa.ServerNameExp = DB2 驱å¨éè¦è¿æ¥å°ç主æºçå称æè
IP å°åã该项没æé»è®¤å¼ã
+dbwizard.tranql-connector-db2-xa.TraceFile = Trace æ件
dbwizard.tranql-connector-db2-xa.TraceFileAppend = TraceFileAppend
-dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = æå®æ¯ç´¯å è¿æ¯è¦çTraceæ件ã该å±æ§çç±»å为å¸å°å¼ãé»è®¤å¼æ¯false,æ为è¦çTraceæ件ã
+dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = æå®æ¯ç´¯å è¿æ¯è¦ç Trace æ件ã该å±æ§çç±»å为å¸å°å¼ãé»è®¤å¼æ¯ false ,æ为è¦ç Trace æ件ã
dbwizard.tranql-connector-db2-xa.TraceFileExp = æ¾ç½®è·è¸ªè®°å½çæ件å称ã
dbwizard.tranql-connector-db2-xa.UserName = ç¨æ·å称
-dbwizard.tranql-connector-db2-xa.UserNameExp = ç¨äºè¿æ¥å°è¿ç«¯æ°æ®åºæå¡å¨çç¨æ·IDçå称ã
+dbwizard.tranql-connector-db2-xa.UserNameExp = ç¨äºè¿æ¥å°è¿ç«¯æ°æ®åºæå¡å¨çç¨æ· ID çå称ã
dbwizard.tranql-connector-derby-client-local.CreateDatabase = å建æ°æ®åº
dbwizard.tranql-connector-derby-client-local.CreateDatabaseExp = æ å¿ä½æ示æ°æ®åºä¸åå¨æ¶æ¯å¦è¦å建ã
dbwizard.tranql-connector-derby-client-local.DatabaseName = æ°æ®åºå称
@@ -178,11 +178,11 @@
dbwizard.tranql-connector-derby-client-local.Password = å¯ç
dbwizard.tranql-connector-derby-client-local.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-derby-client-local.PortNumber = 端å£å·
-dbwizard.tranql-connector-derby-client-local.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
+dbwizard.tranql-connector-derby-client-local.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
dbwizard.tranql-connector-derby-client-local.ServerName = æå¡å¨å称
dbwizard.tranql-connector-derby-client-local.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-derby-client-local.UserName = ç¨æ·å
-dbwizard.tranql-connector-derby-client-local.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤çschema,å¦æçç¥å®å¼æé»è®¤è®¾ä¸º'APP'ã
+dbwizard.tranql-connector-derby-client-local.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤ç schema ,å¦æçç¥ï¼å¼æé»è®¤è®¾ä¸º'APP'ã
dbwizard.tranql-connector-derby-client-xa.CreateDatabase = å建æ°æ®åº
dbwizard.tranql-connector-derby-client-xa.CreateDatabaseExp = æ å¿ä½æ示æ°æ®åºä¸åå¨æ¶æ¯å¦è¦å建ã
dbwizard.tranql-connector-derby-client-xa.DatabaseName = æ°æ®åºå称
@@ -192,51 +192,51 @@
dbwizard.tranql-connector-derby-client-xa.Password = å¯ç
dbwizard.tranql-connector-derby-client-xa.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-derby-client-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-derby-client-xa.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
+dbwizard.tranql-connector-derby-client-xa.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
dbwizard.tranql-connector-derby-client-xa.ServerName = æå¡å¨å称
dbwizard.tranql-connector-derby-client-xa.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-derby-client-xa.UserName = ç¨æ·å
-dbwizard.tranql-connector-derby-client-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤çschema,å¦æçç¥å®å¼æé»è®¤è®¾ä¸º'APP'ã
+dbwizard.tranql-connector-derby-client-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤ç schema ,å¦æçç¥ï¼å¼æé»è®¤è®¾ä¸º'APP'ã
dbwizard.tranql-connector-derby-embed-local.CreateDatabase = å建æ°æ®åº
dbwizard.tranql-connector-derby-embed-local.CreateDatabaseExp = æ å¿ä½æ示æ°æ®åºä¸åå¨æ¶æ¯å¦è¦å建ã
dbwizard.tranql-connector-derby-embed-local.DatabaseName = æ°æ®åºå称
dbwizard.tranql-connector-derby-embed-local.DatabaseNameExp = è¦è¿æ¥çæ°æ®åºå称ã
dbwizard.tranql-connector-derby-embed-local.LoginTimeout = ç»å½è¶
æ¶
-dbwizard.tranql-connector-derby-embed-local.LoginTimeoutExp = 该é
ç½®å±æ§å½å被Derby忽ç¥ã
+dbwizard.tranql-connector-derby-embed-local.LoginTimeoutExp = 该é
ç½®å±æ§å½å被 Derby 忽ç¥ã
dbwizard.tranql-connector-derby-embed-local.Password = å¯ç
dbwizard.tranql-connector-derby-embed-local.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-derby-embed-local.ShutdownDatabase = å
³éæ°æ®åº
-dbwizard.tranql-connector-derby-embed-local.ShutdownDatabaseExp = å¦æ设为å符串"shutdown"ï¼åä»æ°æ®æºè·å¾ä¸ä¸ªjava.sql.Connection对象åå
³éæ°æ®åºã
+dbwizard.tranql-connector-derby-embed-local.ShutdownDatabaseExp = å¦æ设为å符串 "shutdown"ï¼åä»æ°æ®æºè·å¾ä¸ä¸ª java.sql.Connection 对象åå
³éæ°æ®åºã
dbwizard.tranql-connector-derby-embed-local.UserName = ç¨æ·å
-dbwizard.tranql-connector-derby-embed-local.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤çschema,å¦æçç¥å®å¼æé»è®¤è®¾ä¸º'APP'ã
+dbwizard.tranql-connector-derby-embed-local.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤ç schema ,å¦æçç¥ï¼å¼æé»è®¤è®¾ä¸º'APP'ã
dbwizard.tranql-connector-derby-embed-xa.CreateDatabase = å建æ°æ®åº
dbwizard.tranql-connector-derby-embed-xa.CreateDatabaseExp = æ å¿ä½æ示æ°æ®åºä¸åå¨æ¶æ¯å¦è¦å建ãè¿æ¯ä¸ä¸ªå¸å°å¼ã
dbwizard.tranql-connector-derby-embed-xa.DatabaseName = æ°æ®åºå称
dbwizard.tranql-connector-derby-embed-xa.DatabaseNameExp = è¦è¿æ¥çæ°æ®åºå称ã
dbwizard.tranql-connector-derby-embed-xa.LoginTimeout = ç»å½è¶
æ¶
-dbwizard.tranql-connector-derby-embed-xa.LoginTimeoutExp = 该é
ç½®å±æ§å½å被Derby忽ç¥ã
+dbwizard.tranql-connector-derby-embed-xa.LoginTimeoutExp = 该é
ç½®å±æ§å½å被 Derby 忽ç¥ã
dbwizard.tranql-connector-derby-embed-xa.Password = å¯ç
dbwizard.tranql-connector-derby-embed-xa.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-derby-embed-xa.UserName = ç¨æ·å
-dbwizard.tranql-connector-derby-embed-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤çschema,å¦æçç¥å®å¼æé»è®¤è®¾ä¸º'APP'ã
+dbwizard.tranql-connector-derby-embed-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åãå®è¿å»ºç«é»è®¤ç schema,å¦æçç¥ï¼å¼æé»è®¤è®¾ä¸º'APP'ã
dbwizard.tranql-connector-informix-xa.DatabaseName = æ°æ®åºå称
dbwizard.tranql-connector-informix-xa.DatabaseNameExp = æ°æ®åºå称ã
dbwizard.tranql-connector-informix-xa.IfxHost = IfxHost
-dbwizard.tranql-connector-informix-xa.IfxHostExp = Informixæ°æ®åºæå¡å¨çIPå°åæè
主æºåã
+dbwizard.tranql-connector-informix-xa.IfxHostExp = Informix æ°æ®åºæå¡å¨ç IP å°åæè
主æºåã
dbwizard.tranql-connector-informix-xa.IfxProtocolTrace = IfxProtocolTrace
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceExp = IfxPROTOCOLTRACEçå¼ã
+dbwizard.tranql-connector-informix-xa.IfxProtocolTraceExp = IfxPROTOCOLTRACE çå¼ã
dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFile = IfxProtocolTraceFile
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFileExp = IfxPROTOCOLTRACEFILEçå¼ã
+dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFileExp = IfxPROTOCOLTRACEFILE çå¼ã
dbwizard.tranql-connector-informix-xa.IfxSQLHostFile = IfxSQLHostFile
-dbwizard.tranql-connector-informix-xa.IfxSQLHostFileExp = IfxSQLH_FILEçå¼ã
+dbwizard.tranql-connector-informix-xa.IfxSQLHostFileExp = IfxSQLH_FILE çå¼ã
dbwizard.tranql-connector-informix-xa.IfxSQLHostType = IfxSQLHostType
-dbwizard.tranql-connector-informix-xa.IfxSQLHostTypeExp = IfxSQLH_TYPEçå¼ã
+dbwizard.tranql-connector-informix-xa.IfxSQLHostTypeExp = IfxSQLH_TYPE çå¼ã
dbwizard.tranql-connector-informix-xa.Password = å¯ç
dbwizard.tranql-connector-informix-xa.PasswordExp = å¯ç ï¼åºå大å°åï¼ã
dbwizard.tranql-connector-informix-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-informix-xa.PortNumberExp = Informixæ°æ®åºæå¡å¨ç端å£å·ã
+dbwizard.tranql-connector-informix-xa.PortNumberExp = Informix æ°æ®åºæå¡å¨ç端å£å·ã
dbwizard.tranql-connector-informix-xa.ServerName = æå¡å¨å称
-dbwizard.tranql-connector-informix-xa.ServerNameExp = Informixæ°æ®åºæå¡å¨çå®ä¾å称ã
+dbwizard.tranql-connector-informix-xa.ServerNameExp = Informix æ°æ®åºæå¡å¨çå®ä¾å称ã
dbwizard.tranql-connector-informix-xa.UserName = ç¨æ·å
dbwizard.tranql-connector-informix-xa.UserNameExp = ç¨æ·åï¼åºå大å°åï¼ã
dbwizard.tranql-connector-mysql-local.DatabaseName = æ°æ®åºå称
@@ -244,7 +244,7 @@
dbwizard.tranql-connector-mysql-local.Password = å¯ç
dbwizard.tranql-connector-mysql-local.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-mysql-local.PortNumber = 端å£å·
-dbwizard.tranql-connector-mysql-local.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
+dbwizard.tranql-connector-mysql-local.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
dbwizard.tranql-connector-mysql-local.ServerName = æå¡å¨å称
dbwizard.tranql-connector-mysql-local.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-mysql-local.UserName = ç¨æ·å
@@ -254,7 +254,7 @@
dbwizard.tranql-connector-mysql-xa.Password = å¯ç
dbwizard.tranql-connector-mysql-xa.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-mysql-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-mysql-xa.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
+dbwizard.tranql-connector-mysql-xa.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
dbwizard.tranql-connector-mysql-xa.ServerName = æå¡å¨å称
dbwizard.tranql-connector-mysql-xa.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-mysql-xa.UserName = ç¨æ·å
@@ -269,7 +269,7 @@
dbwizard.tranql-connector-oracle-local.DriverTypeExp = \
dbwizard.tranql-connector-oracle-local.LoginTimeout = ç»å½è¶
æ¶
dbwizard.tranql-connector-oracle-local.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-local.MaxStatements = Statementæ大å¼
+dbwizard.tranql-connector-oracle-local.MaxStatements = Statement æ大å¼
dbwizard.tranql-connector-oracle-local.MaxStatementsExp = \
dbwizard.tranql-connector-oracle-local.NetworkProtocol = ç½ç»åè®®
dbwizard.tranql-connector-oracle-local.NetworkProtocolExp = \
@@ -281,7 +281,7 @@
dbwizard.tranql-connector-oracle-local.ServerNameExp = \
dbwizard.tranql-connector-oracle-local.ServiceName = æå¡å称
dbwizard.tranql-connector-oracle-local.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-local.TNSEntryName = TNSæ¡ç®å称
+dbwizard.tranql-connector-oracle-local.TNSEntryName = TNS æ¡ç®å称
dbwizard.tranql-connector-oracle-local.TNSEntryNameExp = \
dbwizard.tranql-connector-oracle-local.UserName = ç¨æ·å
dbwizard.tranql-connector-oracle-local.UserNameExp = \
@@ -295,7 +295,7 @@
dbwizard.tranql-connector-oracle-xa.DriverTypeExp = \
dbwizard.tranql-connector-oracle-xa.LoginTimeout = ç»å½è¶
æ¶
dbwizard.tranql-connector-oracle-xa.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-xa.MaxStatements = Statementæ大å¼
+dbwizard.tranql-connector-oracle-xa.MaxStatements = Statement æ大å¼
dbwizard.tranql-connector-oracle-xa.MaxStatementsExp = \
dbwizard.tranql-connector-oracle-xa.NetworkProtocol = ç½ç»åè®®
dbwizard.tranql-connector-oracle-xa.NetworkProtocolExp = \
@@ -307,7 +307,7 @@
dbwizard.tranql-connector-oracle-xa.ServerNameExp = \
dbwizard.tranql-connector-oracle-xa.ServiceName = æå¡å称
dbwizard.tranql-connector-oracle-xa.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-xa.TNSEntryName = TNSæ¡ç®å称
+dbwizard.tranql-connector-oracle-xa.TNSEntryName = TNS æ¡ç®å称
dbwizard.tranql-connector-oracle-xa.TNSEntryNameExp = \
dbwizard.tranql-connector-oracle-xa.UserName = ç¨æ·å
dbwizard.tranql-connector-oracle-xa.UserNameExp = \
@@ -316,8 +316,8 @@
dbwizard.tranql-connector-postgresql-local.Password = å¯ç
dbwizard.tranql-connector-postgresql-local.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-postgresql-local.PortNumber = 端å£å·
-dbwizard.tranql-connector-postgresql-local.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
-dbwizard.tranql-connector-postgresql-local.PrepareThreshold = Prepareéå¼
+dbwizard.tranql-connector-postgresql-local.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
+dbwizard.tranql-connector-postgresql-local.PrepareThreshold = Prepare éå¼
dbwizard.tranql-connector-postgresql-local.PrepareThresholdExp = \
dbwizard.tranql-connector-postgresql-local.ServerName = æå¡å¨å称
dbwizard.tranql-connector-postgresql-local.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
@@ -328,56 +328,56 @@
dbwizard.tranql-connector-postgresql-xa.Password = å¯ç
dbwizard.tranql-connector-postgresql-xa.PasswordExp = ç¨äºå»ºç«ç©çè¿æ¥çå¯ç è¯ä¹¦ã
dbwizard.tranql-connector-postgresql-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-postgresql-xa.PortNumberExp = è¦è¿æ¥çIP端å£å·ã
-dbwizard.tranql-connector-postgresql-xa.PrepareThreshold = Prepareéå¼
+dbwizard.tranql-connector-postgresql-xa.PortNumberExp = è¦è¿æ¥ç IP 端å£å·ã
+dbwizard.tranql-connector-postgresql-xa.PrepareThreshold = Prepare éå¼
dbwizard.tranql-connector-postgresql-xa.PrepareThresholdExp = \
dbwizard.tranql-connector-postgresql-xa.ServerName = æå¡å¨å称
dbwizard.tranql-connector-postgresql-xa.ServerNameExp = è¦è¿æ¥çæå¡å¨å称ã
dbwizard.tranql-connector-postgresql-xa.UserName = ç¨æ·å
dbwizard.tranql-connector-postgresql-xa.UserNameExp = ç¨äºå»ºç«ç©çè¿æ¥çç¨æ·åã
dbwizard.tranql-connector-sqlserver2000-xa.DatabaseName = æ°æ®åºå称
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = è¦è¿æ¥çSQL Serveræ°æ®åºå称ã
+dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = è¦è¿æ¥ç SQL Server æ°æ®åºå称ã
dbwizard.tranql-connector-sqlserver2000-xa.Password = å¯ç
-dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = ç¨äºè¿æ¥SQL Serveræ°æ®åºçåºå大å°åçå¯ç ã
+dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = ç¨äºè¿æ¥ SQL Server æ°æ®åºçåºå大å°åçå¯ç ã
dbwizard.tranql-connector-sqlserver2000-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = SQL ServerçTCP端å£ï¼é»è®¤ä¸º1433.
+dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = SQL Server ç TCP 端å£ï¼é»è®¤ä¸º 1433ã
dbwizard.tranql-connector-sqlserver2000-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}.æ¥é
微软æ档以è·å¾æ´å¤ä¿¡æ¯ï¼Directä¸è½ç¨äºå管ç¯å¢ä¸ã
+dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}.æ¥é
微软æ档以è·å¾æ´å¤ä¿¡æ¯ï¼Direct ä¸è½ç¨äºå管ç¯å¢ä¸ã
dbwizard.tranql-connector-sqlserver2000-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}ãæ¥é
微软æ档以è·å¾ç»èãé»è®¤æ¯true,è¿ä¸å¤§ä¼å¯¼è´ç¼ç å²çªä½å¨ä¸äºç¯å¢ä¸å¯è½ä¼ç¥å¾®æ
¢ä¸äºã
+dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}ãæ¥é
微软æ档以è·å¾ç»èãé»è®¤æ¯trueï¼è¿ä¸å¤§ä¼å¯¼è´ç¼ç å²çªä½å¨ä¸äºç¯å¢ä¸å¯è½ä¼ç¥å¾®æ
¢ä¸äºã
dbwizard.tranql-connector-sqlserver2000-xa.ServerName = æå¡å¨å称
-dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = SQL ServerçIPå°åã
+dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = SQL Server ç IP å°åã
dbwizard.tranql-connector-sqlserver2000-xa.UserName = ç¨æ·å
-dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = ç¨äºè¿æ¥SQL Serveræ°æ®åºçåºå大å°åçç¨æ·åã
+dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = ç¨äºè¿æ¥ SQL Server æ°æ®åºçåºå大å°åçç¨æ·åã
dbwizard.tranql-connector-sqlserver2005-xa.DatabaseName = æ°æ®åºå称
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = è¦è¿æ¥çSQL Serveræ°æ®åºå称ã
+dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = è¦è¿æ¥ç SQL Server æ°æ®åºå称ã
dbwizard.tranql-connector-sqlserver2005-xa.Password = å¯ç
-dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = ç¨äºè¿æ¥SQL Serveræ°æ®åºçåºå大å°åçå¯ç ã
+dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = ç¨äºè¿æ¥ SQL Server æ°æ®åºçåºå大å°åçå¯ç ã
dbwizard.tranql-connector-sqlserver2005-xa.PortNumber = 端å£å·
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = SQL ServerçTCP端å£ï¼é»è®¤ä¸º1433.
+dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = SQL Server ç TCP 端å£ï¼é»è®¤ä¸º 1433ã
dbwizard.tranql-connector-sqlserver2005-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}.æ¥é
微软æ档以è·å¾æ´å¤ä¿¡æ¯ï¼Directä¸è½ç¨äºå管ç¯å¢ä¸ã
+dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}.æ¥é
微软æ档以è·å¾æ´å¤ä¿¡æ¯ï¼Direct ä¸è½ç¨äºå管ç¯å¢ä¸ã
dbwizard.tranql-connector-sqlserver2005-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}ãæ¥é
微软æ档以è·å¾ç»èãé»è®¤æ¯true,è¿ä¸å¤§ä¼å¯¼è´ç¼ç å²çªä½å¨ä¸äºç¯å¢ä¸å¯è½ä¼ç¥å¾®æ
¢ä¸äºã
+dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}ãæ¥é
微软æ档以è·å¾ç»èãé»è®¤æ¯trueï¼è¿ä¸å¤§ä¼å¯¼è´ç¼ç å²çªä½å¨ä¸äºç¯å¢ä¸å¯è½ä¼ç¥å¾®æ
¢ä¸äºã
dbwizard.tranql-connector-sqlserver2005-xa.ServerName = æå¡å¨å称
-dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = SQL ServerçIPå°åã
+dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = SQL Server ç IP å°åã
dbwizard.tranql-connector-sqlserver2005-xa.UserName = ç¨æ·å
-dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = ç¨äºè¿æ¥SQL Serveræ°æ®åºçåºå大å°åçç¨æ·åã
+dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = ç¨äºè¿æ¥ SQL Server æ°æ®åºçåºå大å°åçç¨æ·åã
dbwizard.usage.applicationCode = åºç¨ä»£ç
-dbwizard.usage.geronimo_webExp = <p>è¦æèµæºå¼ç¨æåGernimoä¸ç¹å®çæ°æ®åºè¿æ¥æ± ï¼Webåºç¨ä¸éè¦æ<tt>geronimo-web.xml</tt>é¨ç½²è®¡åãå®å¯ä»¥æå
å¨WARå
ä¸ç<tt>WEB-INF</tt>ç®å½ï¼ä¹å¯ä»¥å¨å½ä»¤è¡ä¸å°å®åç¬æä¾ç»é¨ç½²å·¥å
·ã<tt>geronimo-web.xml</tt>é¨ç½²è®¡åä¸æ<tt>dependency</tt>å
ç´ å¯ä»¥ç¨æ¥æåæ°æ®åºè¿æ¥æ± 模åï¼å对åºäºäºä¸é¢<tt>web.xml</tt>ç <tt>resource-ref</tt>ç<tt>resource-ref</tt>åï¼å®ç¨æ¥æèµæºå¼ç¨æåç¹å®çæ°æ®åºè¿æ¥æ± ãå¨è¿ä¸ªåä¸<tt>ref-name</tt>å¿
é¡»ä¸
<tt>web.xml</tt> ä¸ç<tt>resource-link</tt>ç¸ä¸è´ã<tt>resource-link</tt>å¨å称ä¸å¿
é¡»ä¸æå¡å¨ä¸å®ä¹çæ°æ®åºè¿æ¥æ± å称ç¸ä¸è´ã</p><p><i>å¦æä½ å¨Geronimoä¸åªé¨ç½²äºä¸ä¸ªåå«{0}çæ°æ®åºè¿æ¥æ± ï¼ä½ å¯ä»¥åä¸é¢ä¸æ ·æåè¿æ¥æ± ã</i></p>
+dbwizard.usage.geronimo_webExp = <p>è¦æèµæºå¼ç¨æå Gernimo ä¸ç¹å®çæ°æ®åºè¿æ¥æ± ï¼Webåºç¨ä¸éè¦æ<tt>geronimo-web.xml</tt>é¨ç½²è®¡åãå®å¯ä»¥æå
å¨ WAR å
ä¸ç<tt>WEB-INF</tt>ç®å½ï¼ä¹å¯ä»¥å¨å½ä»¤è¡ä¸å°å®åç¬æä¾ç»é¨ç½²å·¥å
·ã<tt>geronimo-web.xml</tt>é¨ç½²è®¡åä¸æ<tt>dependency</tt>å
ç´ å¯ä»¥ç¨æ¥æåæ°æ®åºè¿æ¥æ± 模åï¼å对åºäºäºä¸é¢<tt>web.xml</tt>ç <tt>resource-ref</tt>ç<tt>resource-ref</tt>åï¼å®ç¨æ¥æèµæºå¼ç¨æåç¹å®çæ°æ®åºè¿æ¥æ± ãå¨è¿ä¸ªåä¸<tt>ref-name</tt>å¿
é¡»
¸<tt>web.xml</tt> ä¸ç<tt>resource-link</tt>ç¸ä¸è´ã<tt>resource-link</tt>å¨å称ä¸å¿
é¡»ä¸æå¡å¨ä¸å®ä¹çæ°æ®åºè¿æ¥æ± å称ç¸ä¸è´ã</p><p><i>å¦æä½ å¨Geronimoä¸åªé¨ç½²äºä¸ä¸ªåå«{0}çæ°æ®åºè¿æ¥æ± ï¼ä½ å¯ä»¥åä¸é¢ä¸æ ·æåè¿æ¥æ± ã</i></p>
dbwizard.usage.moreThanOnePool = å¦æä½ æå¤äºä¸ä¸ªçè¿æ¥æ± å«åï¼{0}(举ä¾æ¥è¯´,æ两个ä¾èµé¡¹ï¼<b>æ¯ä¸ª</b>é½å
å«ä¸ä¸ªå«{0}çç»ä»¶),é£ä¹ä½ å¯ä»¥åä¸é¢ä¸æ ·æ´ç²¾ç¡®å°å®ä¹è¦ä½¿ç¨çè¿æ¥æ± ï¼
dbwizard.usage.resource_refSection = <tt>web.xml</tt>ä¸æä¸ä¸ª<tt>resource-ref</tt>段å¯ä»¥ç¨æ¥è±¡ä¸é¢ä¸æ ·å£°ææ°æ®åºè¿æ¥æ± ã注æï¼æ们使ç¨<tt>res-ref-name</tt>æ å°å°æå¡å¨ä¸å®ä¹çè¿æ¥æ± çå¼ç¨ãå¨åºç¨ä¸ä½¿ç¨<tt>res-ref-name</tt>çå¼æ¥è®¿é®è¿æ¥æ± ã
dbwizard.usage.searchOnlyOne = è¿ä¼å¨å½ååºç¨ä¸æ¥æ¾ä¸ä¸ªå为{0} çæ°æ®åºè¿æ¥æ± åä»»ä½å为ä¾èµé¡¹ç模åï¼ä»¥åè¿äºä¾èµé¡¹çä¾èµé¡¹ççï¼ã
-dbwizard.usage.title = è¿ä¸ªé¡µé¢ä»ç»äºææ ·å¨J2EEåºç¨ä¸ä½¿ç¨æ°æ®åºè¿æ¥æ± {0}ãè¿é以Webåºç¨ä¸ºä¾ï¼å
¶å®åºç¨æ¨¡åä¹åºè¯¥å¯ä»¥ç¨åæ ·çæ¹å¼å¤çã
+dbwizard.usage.title = è¿ä¸ªé¡µé¢ä»ç»äºææ ·å¨ Java EE åºç¨ä¸ä½¿ç¨æ°æ®åºè¿æ¥æ± {0}ãè¿é以 Web åºç¨ä¸ºä¾ï¼å
¶å®åºç¨æ¨¡åä¹åºè¯¥å¯ä»¥ç¨åæ ·çæ¹å¼å¤çã
dbwizard.usage.usingInCode = è¦è·å¾æåæ°æ®åºè¿æ¥æ± çå¼ç¨ï¼å¨ä½ çåºç¨ä¸åºè¯¥ä½¿ç¨ç±»ä¼¼ä¸é¢ç代ç ã注æï¼ä½ ç JNDI å符串åºè¯¥æ¯<tt>java:comp/env/</tt>åå <tt>web.xml</tt>ä¸ç<tt>res-ref-name</tt>ã
-derbylogmanager.help.title = è¿ä¸ªportletæ¾ç¤ºäºGeronimoå
é¨æ°æ®åºDerbyçæ¥å¿ä¿¡æ¯ã
+derbylogmanager.help.title = è¿ä¸ª portle tæ¾ç¤ºäº Geronimo å
åµæ°æ®åº Derby çæ¥å¿ä¿¡æ¯ã
derbylogmanager.view.Lines = è¡
derbylogmanager.view.containingText = å
å«æå
derbylogmanager.view.filterLog = è¿æ»¤æ¥å¿
derbylogmanager.view.filterResults = è¿æ»¤ç»æ
derbylogmanager.view.integer = ç¦ç¹æå¨å段å¿
须为æ´æ°ã
-derbylogmanager.view.matchCriterial = å¨æ¥å¿æ件ä¸æ»å
±æ {0} æ¡ä¿¡æ¯ï¼ä¸ æ¡ä»¶å¹é
çæ {1} æ¡ã
+derbylogmanager.view.matchCriterial = å¨æ¥å¿æ件ä¸æ»å
±æ {0} æ¡ä¿¡æ¯ï¼ä¸æ¡ä»¶å¹é
çæ {1} æ¡ã
derbylogmanager.view.maxResults = æå¤æ¾ç¤º
derbylogmanager.view.noEntries = 没ææ¾å°ç¬¦åæ¡ä»¶çä¿¡æ¯ã
derbylogmanager.view.numberOfResultsCapped = è¦ççç»ææ°
@@ -390,10 +390,10 @@
internaldb.common.DBProductName = æ°æ®åºäº§åå
internaldb.common.DBProductVersion = æ°æ®åºäº§åçæ¬
internaldb.common.Item = 项
-internaldb.common.JDBCMajorVersion = JDBCé«çæ¬å·
-internaldb.common.JDBCMinorVersion = JDBCä½çæ¬å·
-internaldb.common.SQLCommands = SQLå½ä»¤
-internaldb.common.SQLStateType = SQLè¯å¥ç±»å
+internaldb.common.JDBCMajorVersion = JDBC é«çæ¬å·
+internaldb.common.JDBCMinorVersion = JDBC ä½çæ¬å·
+internaldb.common.SQLCommands = SQL å½ä»¤
+internaldb.common.SQLStateType = SQL è¯å¥ç±»å
internaldb.common.Value = å¼
internaldb.common.application = åºç¨
internaldb.common.create = å建
@@ -419,7 +419,7 @@
internaldb.common.resultSetHoldability = ç»æéçä¿æå
internaldb.common.schemas = 模å¼
internaldb.common.stringFunctions = å符串å½æ°
-internaldb.common.supportedSQLKeywords = æ¯æçSQLå
³é®å
+internaldb.common.supportedSQLKeywords = æ¯æç SQL å
³é®å
internaldb.common.supportedTypes = æ¯æçç±»å
internaldb.common.system = ç³»ç»
internaldb.common.systemFunctions = ç³»ç»å½æ°
@@ -440,12 +440,12 @@
internaldb.listTables.noTables = 没æ表
internaldb.runSQLHelp.createDBExp = è¾å
¥è¦æ°å建çæ°æ®åºçå称ï¼ç¶åç¹å»"å建"æé®ã
internaldb.runSQLHelp.deleteDBExp = è¦å é¤ä¸ä¸ªå·²ç»åå¨çæ°æ®åºï¼è¯·ä»ä¸ææ¡ä¸éæ©å®ï¼å¹¶ç¹å»"å é¤."ã
-internaldb.runSQLHelp.runSQLExp = å¨"SQLå½ä»¤"ææ¬æ¡ä¸ï¼è¾å
¥ç¨åå·åå²çSQLå½ä»¤ï¼ç¹å»"è¿è¡ SQL"æé®æ¥è¿è¡SQLå½ä»¤ã
-internaldb.runSQLHelp.summary = å
许ç¨æ·ä½¿ç¨SQLå½ä»¤ç´æ¥æä½è¡¨ä¸çæ°æ®ï¼å¹¶ä¸å建æå é¤æ°æ®åºãå¨"SQLå½ä»¤"ææ¬æ¡ä¸ï¼ç¨æ·å¯ä»¥è¾å
¥ SQL å½ä»¤,并ç¹å»"è¿è¡SQL."
+internaldb.runSQLHelp.runSQLExp = å¨" SQL å½ä»¤"ææ¬æ¡ä¸ï¼è¾å
¥ç¨åå·åå²ç SQL å½ä»¤ï¼ç¹å»"è¿è¡ SQL"æé®æ¥è¿è¡ SQL å½ä»¤ã
+internaldb.runSQLHelp.summary = å
许ç¨æ·ä½¿ç¨SQLå½ä»¤ç´æ¥æä½è¡¨ä¸çæ°æ®ï¼å¹¶ä¸å建æå é¤æ°æ®åºãå¨"SQL å½ä»¤"ææ¬æ¡ä¸ï¼ç¨æ·å¯ä»¥è¾å
¥ SQL å½ä»¤,并ç¹å»"è¿è¡ SQL."
internaldb.runSQLHelp.useDBExp = ä»ä¸ææ¡ä¸éæ©è¦æä½çæ°æ®åº
internaldb.runSQLHelp.useDSExp = ä»ä¸ææ¡ä¸éæ©è¦æä½çæ°æ®æº
internaldb.runSQLNormal.note1 = 1) 使ç¨;åå¼å¤ä¸ªè¯å¥
-internaldb.runSQLNormal.note2 = 2) å个Selectè¯å¥çæ¥è¯¢ç»æä¼è¢«æ¾ç¤º
+internaldb.runSQLNormal.note2 = 2) å个 Select è¯å¥çæ¥è¯¢ç»æä¼è¢«æ¾ç¤º
internaldb.runSQLNormal.note3 = 3) 使ç¨åå¼å·æ¬ä½ææ¬å符串
internaldb.runSQLNormal.reallyDeleteDatabase = ç¡®å®è¦å é¤è¿ä¸ªæ°æ®åºä¹ï¼
internaldb.runSQLNormal.runSQL = è¿è¡SQL
Modified: geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp (original)
+++ geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp Mon Dec 7 08:10:25 2009
@@ -124,7 +124,7 @@
<!-- Body -->
<td align="left" valign="top">
- <p><center><b>If you're seeing this page via a web browser, it means you've setup<br />
+ <p><center><b>If you're seeing this page via a Web browser, it means you've setup<br />
Apache Geronimo™ successfully. Congratulations!</b></center></p>
<p>As you may have guessed by now, this is the default home page for Geronimo. If you're seeing this page,
@@ -140,12 +140,12 @@
<div style="margin-left: 50px; margin-right: 50px; padding: 10px; background-color:#eee">
<p><b>Would you like your application to appear at this URL?</b><br />
- To set the context root for a web application, you can write a Geronimo deployment
+ To set the context root for a Web application, you can write a Geronimo deployment
plan that uses the <tt>context-root</tt> element to specify the URL prefix used to
reach that application. If you specify a context root of <tt>"/"</tt> then the
application will appear at this URL. However, you'll need to stop this small
Welcome application first!</p>
- <p>Your web deployment plan should look like this, and you can either pack it into
+ <p>Your Web deployment plan should look like this, and you can either pack it into
the WAR at <tt>WEB-INF/geronimo-web.xml</tt> or provide it as a separate argument
to the deploy tool.</p>
<pre><web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
@@ -166,7 +166,7 @@
deploy.[bat|sh] deploy MyWebApp-1.0.war</pre>
</div>
- <p>Geronimo mailing lists are available at the Geronimo project web site:</p>
+ <p>Geronimo mailing lists are available at the Geronimo project Web site:</p>
<ul>
<li><b><a href="mailto:user-subscribe@geronimo.apache.org">user@geronimo.apache.org</a></b> for general questions related to configuring and using Geronimo</li>
@@ -200,7 +200,7 @@
<tr><th colspan="2">Web Application WARs (<a href="/console/portal/apps/apps_war">list</a>)</th></tr>
<tr>
<td>geronimo/jmxdebug-<% if(jetty) {%>jetty<%} else {%>tomcat<%}%>/1.0/car</td>
- <td><i>Optional</i>; JMX debugging web application</td>
+ <td><i>Optional</i>; JMX debugging Web application</td>
</tr>
<tr>
<td>geronimo/jsp-examples-<% if(jetty) {%>jetty<%} else {%>tomcat<%}%>/1.0/car</td>
Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties Mon Dec 7 08:10:25 2009
@@ -25,16 +25,16 @@
apache.jk.ajpPort.networkPortExplanation = <tt>mod_jk</tt> talks to the Geronimo web container using a protocol called AJP. Currently, you do not have an AJP protocol listener configured for the web container. Select a network port here, and an AJP protocol listener will be added for you.
apache.jk.ajpPort.title = <b>Apache mod_jk</b> -- AJP Port
apache.jk.config.logFileLocation = <tt>mod_jk</tt> log file location
-apache.jk.config.logFileLoctionExplanation = <tt>mod_jk</tt> writes to a log file in a location you choose. The log file location needs to be set in the Apache configuration. Please select the location where the <tt>mod_jk</tt> log file should be written.
+apache.jk.config.logFileLoctionExplanation = <tt>mod_jk</tt> writes to a log file in a location you choose. The log file location needs to be set in the Apache configuration. Select the location where the <tt>mod_jk</tt> log file should be written.
apache.jk.config.operatingSystem = Operating System
apache.jk.config.operatingSystemExplanation = The process for installing <tt>mod_jk</tt> depends on the operating system. For some, we can provide specific guidance. For others, you'll have to install <tt>mod_jk</tt> on your own.
apache.jk.config.pathToProperties = Path to <tt>workers.properties</tt>
apache.jk.config.pathToPropertiesExplanation = <tt>mod_jk</tt> requires a file called <tt>workers.properties</tt> to specify which app servers can be contacted on which network ports, etc. This tool will generate the contents for the <tt>workers.properties</tt> file, but it also needs to point to this file in the Apache configuration data, so we need to know where you plan to put this file.
apache.jk.config.title = <b>Apache mod_jk</b> -- Basic Configuration
apache.jk.index.frag1 = This tool walks you through the process of configuring access to Geronimo through the Apache 2 HTTP server using the <tt>mod_jk</tt> Apache module. There are several steps needed to do this:
-apache.jk.index.frag2 = By answering a few questions here, we can give you specific guidance and generate configuration information you can use.
+apache.jk.index.frag2 = Answer a few questions here, and we can give you specific guidance and generate configuration information you can use.
apache.jk.index.getStarted = Get Started
-apache.jk.index.notes = </li></ul><p>Notes:</p><ul><li>Geronimo does not remember previous settings generated using this tool;you'll need to reenter all the data each time, or just paste the new information into your existing configuration files.</li> <li>Any web applications to be exposed via Apache must be running when you run this tool, and of course must be running to be accessed from Apache.</li></ul>
+apache.jk.index.notes = </li></ul><p>Notes:</p><ul><li>Geronimo does not remember previous settings generated using this tool; you need to reenter all the data each time, or just paste the new information into your existing configuration files.</li> <li>Any web applications to be exposed by Apache must be running when you run this tool, and of course must be running to be accessed from Apache.</li></ul>
apache.jk.index.severalSteps = <ol><li>Configure the Geronimo web container to support the AJP protocol</li><li>Install the <tt>mod_jk.so</tt> Apache module (compiling it if necessary)</li><li>Create a <tt>workers.properties</tt> configuration file to point Apache to the Geronimo AJP connector</li><li>Add Apache configuration information indicating which URLs should be sent to Geronimo and whether Apache should serve static content (leaving only dynamic content within the web application to Geronimo)</li></ol>
apache.jk.results.alreadyHasAJPListener = This Geronimo configuration already has an AJP listener running on port {0}. Nothing further needs to be done here.
apache.jk.results.anAJPLisstnerAdded = An AJP listener was added on port {0}. Nothing further needs to be done here.
@@ -43,7 +43,7 @@
apache.jk.results.howToActivateOthers = adding the following line to <tt>/etc/httpd/conf/httpd.conf</tt>:</p><pre>LoadModule jk_module modules/mod_jk.so</pre> <p>Then you can start Apache by running <tt>service httpd start</tt> (or <tt>service httpd restart</tt>).
apache.jk.results.howToActivateifOsSuSE = editing <tt>/etc/sysconfig/apache2</tt> and adding <tt>jk</tt> to the value configured for <tt>APACHE_MODULES</tt> and then running (as root) <tt>SuSEconfig</tt> followed by <tt>rcapache2 start</tt> (or <tt>rcapache2 restart</tt>).
apache.jk.results.noInstructionsToInstall = </p><p>Based on your operating system selection, I don't have specific instructions to install <tt>mod_jk</tt>. You may be able to get a binary release from <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/"> http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/</a>. Otherwise, you'll have to build from source.</p><p>To enable <tt>mod_jk</tt> in Apache, you typically need to install the <tt>.so</tt> (Linux/UNIX/Mac OS X) or <tt>.dll</tt> (Windows) and then add a line to the <tt>httpd.conf</tt> file like this:</p> <pre> LoadModule jk_module modules/mod_jk.so</pre> <p>Finally, start or restart Apache.</p>
-apache.jk.results.saveFollowingToFile = You have decided to save this file at <tt> {0} </tt>. Please save the following content to that file.
+apache.jk.results.saveFollowingToFile = You have decided to save this file at <tt> {0} </tt>. Save the following content to that file.
apache.jk.results.saveWhereIfSuSE = For SuSE, this should be saved to a file in the Apache conf.d dir, e.g.write this content to <tt>/etc/apache2/conf.d/geronimo-jk.conf</tt>
apache.jk.results.saveWhereOthwise = This information should be added to the Apache configuration file. This is often at a location such as <tt>/etc/httpd/conf/httpd.conf</tt>
apache.jk.results.step1 = Step 1: Configure Geronimo for AJP
@@ -52,7 +52,7 @@
apache.jk.results.step3 = Step 3: Create a <tt>workers.properties</tt> file
apache.jk.results.step4 = Step 4: Apache Configuration<h2>
apache.jk.results.step5 = Step 5: Restart Apache
-apache.jk.results.step5Content = With those steps completed, Apache should be ready to go! Start Geronimo and restart Apache and try accessing a Geronimo web application through an Apache URL. If there are any problems, check the Apache error log, and the mod_jk error log (at <tt>{0}</tt>).
+apache.jk.results.step5Content = With those steps completed, Apache should be ready to go! Start Geronimo and restart Apache and try accessing a Geronimo web application through an Apache URL. If there are any problems, check the Apache error log and the mod_jk error log (at <tt>{0}</tt>).
apache.jk.results.summary = This page lists the things you must do to enable <tt>mod_jk</tt> in Apache and configure it to talk to Geronimo.
apache.jk.results.title = <b>Apache mod_jk</b> -- Configuration Results
apache.jk.webApps.dynamicPaths = Dynamic Paths
@@ -81,7 +81,7 @@
ca.common.commonName = Common Name
ca.common.company_Organization = Company/Organization
ca.common.countryCode = Country Code
-ca.common.criticalExt = critical ext
+ca.common.criticalExt = Critical ext
ca.common.detailsOfCert = Details of the Certificate to be issued
ca.common.emptyText = The focussed field must not be empty.
ca.common.fingerPrints = Finger prints
@@ -95,7 +95,7 @@
ca.common.lockCA = Lock CA
ca.common.mmddyyyy = The focussed field must be a date in MM/DD/YYYY format.
ca.common.noRequests = There are no requests.
-ca.common.nonCriticalExt = non-critical ext
+ca.common.nonCriticalExt = Non-critical ext
ca.common.passwordMismatch = Password does not match.
ca.common.processCSR = Process CSR
ca.common.publicKey = Public Key
@@ -118,19 +118,19 @@
ca.common.viewCADetails = View CA Details
ca.common.viewIssuedCert = View Issued Certificate
ca.common.wrongDate = To Date must be after From Date.
-ca.confirmCA.summary = This screen lets you review the CA details entered in the previous screen. If you need to modify any information shown here, please go back to the previous screen. Upon clicking the <i>Setup Certification Authority</i> button, a keypair and a self-signed certificate will be generated and stored in a keystore. CA's certificate serial number is stored in a text file and the number is incremented each time a CSR is processed by the CA.
+ca.confirmCA.summary = This screen lets you review the CA details entered in the previous screen. If you need to modify any information shown here, go back to the previous screen. Once you click the <i>Setup Certification Authority</i> button, a keypair and a self-signed certificate will be generated and stored in a keystore. CA's certificate serial number is stored in a text file and the number is incremented each time a CSR is processed by the CA.
ca.confirmCA.title = <b>Setup Certification Authority</b> - Step 2: Review and Confirm CA details
ca.confirmCertReq.approveCSR = Approve CSR
ca.confirmCertReq.confirmCertRequest = Confirm Certificate Request
ca.confirmCertReq.rejectCSR = Reject CSR
ca.confirmCertReq.summary = This screen shows the details of the Certificate Signing Request (CSR) and allows you to approve the request. Once the request is approved, it will be considered for issue of a certificate.
ca.confirmClientCert.issueCert = Issue Certificate
-ca.confirmClientCert.summary = This screen shows the CSR details and the certificate details entered in the previous screen. Upon clicking the <i>Issue Certificate</i> button, a certificate will be issued and stored. The next screen will show the details of the certificate issued.
+ca.confirmClientCert.summary = This screen shows the CSR details and the certificate details entered in the previous screen. Once you click the <i>Issue Certificate</i> button, a certificate will be issued and stored. The next screen will show the details of the certificate issued.
ca.confirmClientCert.title = <b>Issue New Certificate</b> - Step 3: Confirm and Issue Certificate
ca.index.CAFunctionsAccessed = CA functions can be accessed using the links provided below.
ca.index.CAInitialized = CA has been initialized.
-ca.index.CALocked = But, the CA is locked. Please unlock the CA to access CA functions.
-ca.index.CANotInitialized = CA is not running or the CA may not have been initialized. Please initialize the CA using the link provided below.
+ca.index.CALocked = But, the CA is locked. Unlock the CA to access CA functions.
+ca.index.CANotInitialized = CA is not running or the CA may not have been initialized. Initialize the CA using the link provided below.
ca.index.publishCACert = Publish CA Certificate
ca.index.requestsToBeFulfilled = Requests to be fulfilled
ca.index.requestsToBeVerified = Requests to be verified
@@ -140,32 +140,32 @@
ca.listRequestsVerify.certRequestsAwaitingVerify = Certificate Requests awaiting verification
ca.listRequestsVerify.certRequestsAwaitingVerifyExp = This screen shows the certificate requests waiting for verification.
ca.processCSR.pastePkcs10here = ...paste pkcs10 encoded certificate request here...
-ca.processCSR.summary = This screen lets you process Certificate Signing Request (CSR) text and view the details of the requestor. Paste the content of CSR text file you received from the requestor and click on<i>Process CSR</i> button. The next screen will show the details of the requestor and allow you to input information required to issue a certificate.
+ca.processCSR.summary = This screen lets you process Certificate Signing Request (CSR) text and view the details of the requestor. Paste the content of CSR text file you received from the requestor and click the <i>Process CSR</i> button. The next screen will show the details of the requestor and allow you to input information required to issue a certificate.
ca.processCSR.title = <b>Issue New Certificate</b> - Step 1: Process Certificate Signing Request (CSR)
ca.setupCA.summary = On this screen you can enter the Certification Authority (CA) details, algorithm parameters for CA's keypair, algorithm for CA's self signed certificate and a password to protect the CA's private key. The next screen will let you review this information before generating the CA's keypair and self-signed certificate.
ca.setupCA.title = <b>Setup Certification Authority</b> - Step 1: Enter CA details
ca.unlockCA.enterCAPrivateKeyPassword = Enter the CA's private key password
ca.unlockCA.summary = This screen lets you unlock the CA by providing the password used to protect the CA's private key. Once unlocked, the CA functions will be available.
ca.viewCertificate.backToRequest = Back to Requests to be fulfilled
-ca.viewCertificate.enterSerialNumber = Enter the serial number of the certificate to be viewed and click on <i>View Certificate</i> button.
+ca.viewCertificate.enterSerialNumber = Enter the serial number of the certificate to be viewed and click the <i>View Certificate</i> button.
ca.viewCertificate.screenShows = This screen shows the details of a certificate issued by the CA. The base64 encoded certificate text should be sent to the requestor as a reply to their Certificate Signing Request (CSR).
configmanager.help.stopStart = Stop/Start
-configmanager.help.stopStartExp = The stop/start toggle can be clicked to stop or start an application. If the toggle says "Stop" the application is running so clicking on the Stop toggle will stop the application and vice versa.
+configmanager.help.stopStartExp = The stop/start toggle can be clicked to stop or start an application. If the toggle says "Stop" the application is running. So clicking the Stop toggle will stop the application and vice versa.
configmanager.help.title = This page lists the applications that have been installed in the server and whether they are running or stopped. There are four columns; two provide information and the other two allow user action. The first column indicates the state of the application, either "stopped" or "running." The fourth column shows the configID of the application. The two remaining columns are:
configmanager.help.uninstallExp = The uninstall link will undeploy/remove the application from Geronimo.
configmanager.normal.cancel = Cancel
configmanager.normal.childComponents = Child Components
configmanager.normal.componentName = Component Name
-configmanager.normal.confirmMsg01 = \ is an Apache Geronimo service. Stopping this component may prevent the server or the administration console from functioning properly. All dependent components and subsequent dependencies will also be stopped. Reference the "Child Components" list in the view for directly affected components. Proceed with this action?
+configmanager.normal.confirmMsg01 = \ is an Apache Geronimo service. Stopping this component can prevent the server or the administration console from functioning properly. All dependent components and subsequent dependencies will also be stopped. See the "Child Components" list in the view for directly affected components. Proceed with this action?
configmanager.normal.confirmMsg02 = \ provides the administration console interface that you are currently viewing. Stopping it will cause the interface to become unavailable and manual action will be required to restore the function. Proceed with this action?
-configmanager.normal.confirmMsg03 = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). All dependent components and subsequent dependencies will also be stopped. Proceed with this action?
-configmanager.normal.confirmMsg04 = \ is an Apache Geronimo service. Restarting this component may prevent the server or the administration console from functioning properly. As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Only this component will be restarted. Reference the "Child Components" list in the view for directly affected components. Proceed with this action?
+configmanager.normal.confirmMsg03 = \ is provided by Apache Geronimo and may be required by other modules (see the "Child Components" listed in the view). All dependent components and subsequent dependencies will also be stopped. Proceed with this action?
+configmanager.normal.confirmMsg04 = \ is an Apache Geronimo service. Restarting this component may prevent the server or the administration console from functioning properly. As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Only this component will be restarted. See the "Child Components" list in the view for directly affected components. Proceed with this action?
configmanager.normal.confirmMsg05 = \ provides the administration console interface that you are currently viewing. Restarting it will cause the interface to become unavailable and manual action may be necessary to restore the console function. Proceed with this action?
-configmanager.normal.confirmMsg06 = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Proceed with this action?
-configmanager.normal.confirmMsg07 = \ is an Apache Geronimo service. Uninstalling this component may have unexpected results such as rendering the administration web console or even the server itself unstable. Reference the "Child Components" view for directly affected components. Are you certain you wish to proceed with this uninstall?
+configmanager.normal.confirmMsg06 = \ is provided by Apache Geronimo and may be required by other modules (see the "Child Components" listed in the view). As part of the stop action, all dependent components and subsequent dependencies will also be stopped. Proceed with this action?
+configmanager.normal.confirmMsg07 = \ is an Apache Geronimo service. Uninstalling this component might have unexpected results such as rendering the administration web console or even the server itself unstable. See the "Child Components" view for directly affected components. Are you certain you wish to proceed with this uninstall?
configmanager.normal.confirmMsg08 = \ provides the administration console user interface that you are currently viewing. Uninstalling it will cause the interface to become unavailable and manual action will be required to restore the function. Are you certain you wish to proceed with this uninstall?
-configmanager.normal.confirmMsg09 = \ is provided by Apache Geronimo and may be required by other modules (reference the "Child Components" listed in the view). Are you certain you wish to proceed with this uninstall?
+configmanager.normal.confirmMsg09 = \ is provided by Apache Geronimo and might be required by other modules (see the "Child Components" listed in the view). Are you certain you wish to proceed with this uninstall?
configmanager.normal.confirmMsg10 = Are you certain you wish to uninstall
configmanager.normal.displayName = Display Name
configmanager.normal.expertMode = Expert User (enable all actions on Geronimo Provided Components)
@@ -309,9 +309,9 @@
keystore.confirmCertificate.certificateDetails = Certificate Details
keystore.confirmCertificate.fingerprint = Fingerprint
keystore.confirmCertificate.importCertificate = Import Certificate
-keystore.confirmCertificate.title = Please confirm that this is the correct certificate to import:
+keystore.confirmCertificate.title = Confirm that this is the correct certificate to import:
keystore.confirmKey.generateKey = Generate Key
-keystore.confirmKey.title = Please confirm that this is the correct information for the key I'm about to generate:
+keystore.confirmKey.title = Confirm that this is the correct information for the key I'm about to generate:
keystore.createKeystore.createKeystore = Create Keystore
keystore.createKeystore.keystoreFileName = Keystore file name
keystore.createKeystore.passwordForKeystore = Password for new keystore
@@ -332,7 +332,7 @@
keystore.index.title = This tool walks you through the process of configuring keystores to use with SSL connectors (for the web container, etc.).
keystore.index.type = Type
keystore.index.unlocked = Unlocked
-keystore.unlockKey.title = The keystore has been unlocked. However, a private key within the keystore also needs to be unlocked in order for SSL to work properly. Please specify the password for the private key within the keystore.
+keystore.unlockKey.title = The keystore has been unlocked. However, a private key within the keystore also needs to be unlocked in order for SSL to work properly. Specify the password for the private key within the keystore.
keystore.unlockKey.unlockPrivateKey = Unlock Private Key
keystore.unlockKeystore.enterKeystorePassword = Enter keystore password
keystore.uploadCertificate.aliasForCertificate = Alias for certificate
@@ -358,9 +358,9 @@
logmanager.help.configFileExplanation = Another configuration file can be used by entering a different path and file name in the Config file text box.
logmanager.help.introduction = <p>This portlet allows the user to temporarily select a configuration file for logging and/or change the log level and Refresh period. The default "Config file" is a standard log4j file and defines the location where the Geronimo Server will log Geronimo output. The configuration file also defines the log level, the maximum log file size, and other attributes associated with logging. <br> <br> Gereonimo Console will display output from the Geronimo log file in the Server Log Viewer portlet in the next window pane.</p>
logmanager.help.logLevelExplanation = The user may select a level for logging from the drop-down menu.
-logmanager.help.refreshPeriodExplanation = By default Geronimo checks every 60 seconds to see if the configuration file has changed. The user may modify the refresh period.
+logmanager.help.refreshPeriodExplanation = By default Geronimo checks every 60 seconds to see whether the configuration file has changed. The user may modify the refresh period.
logmanager.help.resetExplanation = Resets the "Config File", "Refresh Period" and "Log Level" to their settings at the last "Update." It does not reset to the Geronimo Server defaults.
-logmanager.help.updateExplanation = Make changes take effect until next server restart.
+logmanager.help.updateExplanation = Make changes take effect until next server restarts.
logmanager.search.containingText = Containing text
logmanager.search.fileterLog = Filter Log
logmanager.search.go = Go
@@ -373,15 +373,15 @@
logmanager.search.to = To
logmanager.search.withExceptions = With Exceptions
logmanager.viewhelp.filterResults = Filter results
-logmanager.viewhelp.filterResultsExplanationFrag1 = Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser may limit how many lines can be displayed at once.
+logmanager.viewhelp.filterResultsExplanationFrag1 = Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser might limit how many lines can be displayed at once.
logmanager.viewhelp.filterResultsExplanationFrag2 = The user may filter on the log level to display only log lines at that level.
logmanager.viewhelp.filterResultsExplanationFrag3 = The user may also enter a string of text to search for.
logmanager.viewhelp.introduction = This portlet displays the Geronimo server log and is helpful for debugging problems with the Geronimo Console and with deployed applications.
logmanager.viewhelp.refreshExplanation = Resets the filtering criteria to Geronimo Console's defaults and displays the latest 11 lines in the Geronimo log file.
-repository.help.addDependencyElement = To use an artifact in an application, add a dependency element into it's deployment plan. For example, to use Castor XML add the following XML to the plan:
+repository.help.addDependencyElement = To use an artifact in an application, add a dependency element into its deployment plan. For example, to use Castor XML add the following XML to the plan:
repository.help.browseExplanation = Browse to select the artifact to be added.
-repository.help.installExplanation = Click on this button to install the artifact.
+repository.help.installExplanation = Click this button to install the artifact.
repository.help.title = This page displays the artifacts installed in the server's repository. The layout of the repository is the same as that used by Apache Maven making it possible to easily copy files over. The Geronimo Console provides a method for adding artifacts:
repository.normal.addArchiveToRepository = Add Archive to Repository
repository.normal.artifact = Artifact
@@ -391,7 +391,7 @@
repository.normal.replacedName = Replaced component name
repository.normal.replacedNameDescription = Specify an existing component name to be replaced during runtime, the component name should be like groupId/artifactId/Version/Type. Otherwise, leave the field blank.
repository.normal.title = Add Archive to Repository
-repository.normal.toViewUsage = Click on an entry to view usage.
+repository.normal.toViewUsage = Click an entry to view usage.
repository.usage.content = To use <b>{0}</b> in an application or a module, add a dependency element under dependencies in environment element in it's deployment plan as shown below:
repository.usage.title = Usage for {0}
@@ -407,29 +407,29 @@
securityrealmmanager.derby.groups.help.addNewGroupBtnExp = Clicking this button will create the new group. If users had been put in the new group, clicking "Add" will create the new group with the selected users in it.
securityrealmmanager.derby.groups.help.cancelUserBtnExp = Will cancel the creation of the new group and return the previous page to the browser.
securityrealmmanager.derby.groups.help.descriptionExp = The description of the group.
-securityrealmmanager.derby.groups.help.title = This portlet lists all the Application Realm groups and allows the user to add, modify and delete them. To add a new group click on the "Create New Group" link and fill in the fields on that page. To modify an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the "Delete" link to the right of the group to be deleted. <br> <br> Clicking on the "Create New Group" link allows creation of a new group by filling in the fields and clicking on the "Add" button.
-securityrealmmanager.derby.groups.help.usersExp = The box on the left lists all the current user accounts. Selecting a user and then clicking the "Add>>" button will put the user in the group. Selecting a user in the list to the right and clicking on the "<<Remove" button will delete the user from the group.
+securityrealmmanager.derby.groups.help.title = This portlet lists all the Application Realm groups and allows the user to add, modify and delete them. To add a new group click the "Create New Group" link and fill in the fields on that page. To modify an existing group, click the group link and change the field(s) on the page. To delete a group, click the "Delete" link to the right of the group to be deleted. <br> <br> Clicking the "Create New Group" link allows creation of a new group by filling in the fields and clicking on the "Add" button.
+securityrealmmanager.derby.groups.help.usersExp = The box on the left lists all the current user accounts. To put the user in the group, select a user and then click the "Add>>" button. To delete the user from the group, select a user in the list to the right and click the "<<Remove" button.
securityrealmmanager.derby.groups.maximized.createNewGroup = Create New Group
securityrealmmanager.derby.users.addmaximized.addUser = ADD USER
securityrealmmanager.derby.users.addmaximized.updateUser = UPDATE USER
-securityrealmmanager.derby.users.help.addUserBtnExp = To add the new user click the "Add" button.
-securityrealmmanager.derby.users.help.cancelUserBtnExp = To cancel an add this button must be clicked before the "Add" button.
+securityrealmmanager.derby.users.help.addUserBtnExp = To add the new user, click the "Add" button.
+securityrealmmanager.derby.users.help.cancelUserBtnExp = To cancel an added user, click this button before the "Add" button.
securityrealmmanager.derby.users.help.confirmPasswordExp = Re-enter the new user's password.
-securityrealmmanager.derby.users.help.createUserBtnExp = Click on this button to create the new user and return to the main "Console Realm Users" page. The new user will be listed there.
+securityrealmmanager.derby.users.help.createUserBtnExp = Click this button to create the new user and return to the main "Console Realm Users" page. The new user will be listed there.
securityrealmmanager.derby.users.help.departmentExp = The user's department.
securityrealmmanager.derby.users.help.emailExp = The user's email address.
securityrealmmanager.derby.users.help.familyNameExp = The user's last name.
securityrealmmanager.derby.users.help.givenNameExp = The user's first name.
securityrealmmanager.derby.users.help.passwordExp = Password for the new user.
-securityrealmmanager.derby.users.help.title = This page lists all the application realm users and allows you to add, modify and delete them. To add a new user click on the "Create New User" link and fill in the fields on that page. To modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the "Delete" link to the right of the user to be deleted. <br> <br> Clicking on the "Create New User" link allows adding users by filling in the fields and clicking on the "Add" button. The fields are defined as follows:
+securityrealmmanager.derby.users.help.title = This page lists all the application realm users and allows you to add, modify and delete them. To add a new user, click the "Create New User" link and fill in the fields on that page. To modify a user's account, click the username link for the user and change the field(s) on the page. To delete a user, click the "Delete" link to the right of the user to be deleted. <br> <br> Clicking the "Create New User" link allows adding users by filling in the fields and clicking the "Add" button. The fields are defined as follows:
securityrealmmanager.derby.users.help.usernameExp = The username for the user.
securityrealmmanager.derby.users.maximized.createNewUser = Create New User
securityrealmmanager.se.groups.addmaximized.addGroup = ADD GROUP
securityrealmmanager.se.groups.addmaximized.updateGroup = UPDATE GROUP
securityrealmmanager.se.groups.help.addNewGroupBtnExp = Clicking this button will create the new group. If users had been put in the new group, clicking "Add" will create the new group with the selected users in it.
securityrealmmanager.se.groups.help.cancelNewGroupBtnExp = Cancel the current operation.
-securityrealmmanager.se.groups.help.title = This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new group click on the "Create New Group" link and fill in the fields on that page. To modify an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the "Delete" link to the right of the group to be deleted. <br> <br>Clicking on the "Create New Group" link allows the user to add a new group. The fields are defined as follows:
-securityrealmmanager.se.groups.help.usersExp = The box on the left lists all the current user accounts. Selecting a user and then clicking the "Add>>" button will put the user in the group. Selecting a user in the list to the right and clicking on the "<<Remove" button will delete the user from the group.
+securityrealmmanager.se.groups.help.title = This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new, click the "Create New Group" link and fill in the fields on that page. To modify an existing group, click the group link and change the field(s) on the page. To delete a group, click the "Delete" link to the right of the group to be deleted. <br> <br>Clicking on the "Create New Group" link allows the user to add a new group. The fields are defined as follows:
+securityrealmmanager.se.groups.help.usersExp = The box on the left lists all the current user accounts. To put the user in the group, select a user and then click the "Add>>" button. To delete the user from the group, select a user in the list to the right and click the "<<Remove" button.
securityrealmmanager.se.groups.maximized.createNewGroup = Create New Group
securityrealmmanager.se.groups.maximized.createNewUser = Create New User
securityrealmmanager.se.groups.maximized.noUsers = No available users.
@@ -441,13 +441,13 @@
securityrealmmanager.se.users.help.confirmPasswordExp = Re-enter the new user's password.
securityrealmmanager.se.users.help.createUserBtnExp = Click on this button to create the new user and return to the main "Console Realm Users" page. The new user will be listed there.
securityrealmmanager.se.users.help.passwordExp = Password for the new user.
-securityrealmmanager.se.users.help.title = This portlet lists all the console realm users and allows the user to add, modify and delete them. To add a new user click on the "Create New User" link and fill in the fields on that page. To modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the "Delete" link to the right of the user to be deleted.<br> <br> Clicking on the Create New User link brings up a page that allows adding users by filling in the fields and clicking on the"Add" button. The fields are defined as follows:
+securityrealmmanager.se.users.help.title = This portlet lists all the console realm users and allows the user to add, modify and delete them. To add a new user click the "Create New User" link and fill in the fields on that page. To modify a user's account, click the username link for the user and change the field(s) on the page. To delete a user, click the "Delete" link to the right of the user to be deleted.<br> <br> Clicking the Create New User link brings up a page that allows adding users by filling in the fields and clicking on the"Add" button. The fields are defined as follows:
securityrealmmanager.se.users.help.usernameExp = The username for the user.
securityrealmmanager.se.users.maximized.createNewUser = Create New User
servermanager.help.shutdownHelpBody = <p>This portlet give the admin the ability to remotely shutdown the Geronimo server.</p><p>A shutdown will shutdown the server and cause the JVM to exit. To continue using the Geronimo Console after a shutdown, Geronimo must be restarted.</p>
servermanager.normal.cancel = Cancel
-servermanager.normal.comfirmMsg01 = Are you sure you want to shutdown the server (last chance)?
+servermanager.normal.comfirmMsg01 = Are you sure that you want to shutdown the server (last chance)?
servermanager.normal.ok = OK
servermanager.normal.proceedOnlyIf = Proceed only if you are certain you want to terminate the server.
servermanager.normal.shutdown = Shutdown
@@ -509,10 +509,10 @@
webmanager.common.bufferSize = BufferSize
webmanager.common.bufferSizeExp = The size (in bytes) of the buffer to be provided for input streams created by this connector. By default, buffers of 2048 bytes will be provided.
webmanager.common.ciphers = Ciphers
-webmanager.common.ciphersExp = A comma separated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
+webmanager.common.ciphersExp = A comma-separated list of the encryption ciphers that may be used. If not specified, any available cipher may be used.
webmanager.common.clientAuthRequired = Client Auth Required
webmanager.common.compressableMimeType = CompressableMimeType
-webmanager.common.compressableMimeTypeExp = The value is a comma separated list of MIME types for which HTTP compression may be used. The default value is text/html,text/xml,text/plain.
+webmanager.common.compressableMimeTypeExp = The value is a comma-separated list of MIME types for which HTTP compression may be used. The default value is text/html,text/xml,text/plain.
webmanager.common.compression = Compression
webmanager.common.compressionExp = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is "off" (disable compression), "on" (allow compression, which causes text data to be compressed), "force" (forces compression in all cases), or a numerical integer value (which is equivalent to "on", but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to "on" or more aggressive, the output will also be compressed. If not specified, this attribute is set to "off".
webmanager.common.confirmPassword = Confirm Password
@@ -526,7 +526,7 @@
webmanager.common.emptySessionPathExp = If checked, all paths for session cookies will be set to /.
webmanager.common.emptyText = The focussed field must not be empty.
webmanager.common.enableLookups = EnableLookups
-webmanager.common.enableLookupsExp = Check if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client. By default, DNS lookups are enabled.
+webmanager.common.enableLookupsExp = Check whether you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client. By default, DNS lookups are enabled.
webmanager.common.fields = fields
webmanager.common.host = Host
webmanager.common.hostExp = The host name or IP to bind to. The normal values are <tt>0.0.0.0</tt> (all interfaces) or <tt>localhost</tt> (local connections only)
@@ -552,11 +552,11 @@
webmanager.common.maxThreads = Max Threads
webmanager.common.maxThreadsExp = The maximum number of threads this connector should use to handle incoming requests
webmanager.common.minSpareThreads = MinSpareThreads
-webmanager.common.minSpareThreadsExp = The number of request processing threads that will be created when this Connector is first started. The connector will also make sure it has the specified number of idle processing threads available. This attribute should be set to a value smaller than that set for maxThreads. The default value is 4.
+webmanager.common.minSpareThreadsExp = The number of request processing threads that will be created when this Connector is first started. The connector will also make sure that it has the specified number of idle processing threads available. This attribute should be set to a value smaller than that set for maxThreads. The default value is 4.
webmanager.common.minThreads = Min Threads
webmanager.common.minThreadsExp = The minimum number of threads this connector should use to handle incoming requests
webmanager.common.noCompressionUserAgents = NoCompressionUserAgents
-webmanager.common.noCompressionUserAgentsExp = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation. The default value is an empty String (regexp matching disabled).
+webmanager.common.noCompressionUserAgentsExp = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation. The default value is an empty String (regexp matching disabled).
webmanager.common.port = Port
webmanager.common.portExp = The network port to bind to.
webmanager.common.protocol = Protocol
@@ -567,7 +567,7 @@
webmanager.common.redirectPort = RedirectPort
webmanager.common.redirectPortExp = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
webmanager.common.restrictedUserAgents = RestrictedUserAgents
-webmanager.common.restrictedUserAgentsExp = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. The default value is an empty String (regexp matching disabled).
+webmanager.common.restrictedUserAgentsExp = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. The default value is an empty String (regexp matching disabled).
webmanager.common.server = Server
webmanager.common.serverExp = The Server header for the http response. Unless your paranoid, you won't need this feature. (No offense. The description is taken from Tomcat documentation.)
webmanager.common.show = Show
@@ -587,7 +587,7 @@
webmanager.common.truststorePassword = Truststore Password
webmanager.common.truststoreType = Truststore Type
webmanager.common.uniqueName = Unique Name
-webmanager.common.uniqueNameExp = A name that is different than the name for any other web connectors in the server (no spaces in the name please)
+webmanager.common.uniqueNameExp = A name that is different from the name for any other web connectors in the server (no spaces in the name please)
webmanager.common.uriEncoding = URIEncoding
webmanager.common.uriEncodingExp = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL. Default is ISO-8859-1.
webmanager.common.useBodyEncodingForURI = UseBodyEncodingForURI
@@ -603,7 +603,7 @@
webmanager.connector.editConnector.JettyManagerImpl.38 = The maximum unaccepted connections to queue if no threads are available.
webmanager.connector.editConnector.JettyManagerImpl.40 = The maximum time in seconds that a connection lingers during close handshaking.
webmanager.connector.editConnector.JettyManagerImpl.42 = Port to redirect to for confidential connections. 0 if not supported.
-webmanager.connector.editConnector.JettyManagerImpl.44 = If set, then clients connecting through this connector must supply a valid client certificate.
+webmanager.connector.editConnector.JettyManagerImpl.44 = If set, clients connecting through this connector must supply a valid client certificate.
webmanager.connector.editConnector.JettyManagerImpl.47 = The keystore to use for accessing the server's private key
webmanager.connector.editConnector.JettyManagerImpl.50 = The keystore containing the trusted certificate entries, including Certification Authority (CA) certificates
webmanager.connector.editConnector.JettyManagerImpl.53 = This should normally be set to TLS, though some (IBM) JVMs don't work properly with popular browsers unless it is changed to SSL.
@@ -615,7 +615,7 @@
webmanager.connector.editConnector.TomcatManagerImpl.108 = The host name or IP to bind to. The normal values are 0.0.0.0 (all interfaces) or localhost (local connections only).
webmanager.connector.editConnector.TomcatManagerImpl.11 = Protocol which may be used for communicating with clients.
webmanager.connector.editConnector.TomcatManagerImpl.110 = The size (in bytes) of the buffer to be provided for input streams created by this connector.
-webmanager.connector.editConnector.TomcatManagerImpl.113 = The value is a comma separated list of MIME types for which HTTP compression may be used.
+webmanager.connector.editConnector.TomcatManagerImpl.113 = The value is a comma-separated list of MIME types for which HTTP compression may be used.
webmanager.connector.editConnector.TomcatManagerImpl.116 = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is <i>off</i> (disable compression), <i>on</i> (allow compression, which causes text data to be compressed), <i>force</i> (forces compression in all cases), or a numerical integer value (which is equivalent to <i>on</i>, but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to <i>on</i> or more aggressive, the output will also be compressed.
webmanager.connector.editConnector.TomcatManagerImpl.118 = The number of milliseconds during which the sockets used by this Connector will linger when they are closed. The default value is -1 (socket linger is disabled).
webmanager.connector.editConnector.TomcatManagerImpl.120 = The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be presented.
@@ -627,10 +627,10 @@
webmanager.connector.editConnector.TomcatManagerImpl.132 = The maximum number of request processing threads to be created by this Connector, which therefore determines the maximum number of simultaneous requests that can be handled. If not specified, this attribute is set to 40. If an executor is associated with this connector, this attribute is ignored as the connector will execute tasks using the executor rather than an internal thread pool.
webmanager.connector.editConnector.TomcatManagerImpl.134 = Minimum spare threads
webmanager.connector.editConnector.TomcatManagerImpl.136 = Maximum spare threads
-webmanager.connector.editConnector.TomcatManagerImpl.139 = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation.
+webmanager.connector.editConnector.TomcatManagerImpl.139 = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation.
webmanager.connector.editConnector.TomcatManagerImpl.14 = Ciphers which may be used for communicating with clients.
webmanager.connector.editConnector.TomcatManagerImpl.141 = The TCP port number on which this Connector will create a server socket and await incoming connections. Your operating system will allow only one server application to listen to a particular port number on a particular IP address.
-webmanager.connector.editConnector.TomcatManagerImpl.144 = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features.
+webmanager.connector.editConnector.TomcatManagerImpl.144 = The value is a comma-separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features.
webmanager.connector.editConnector.TomcatManagerImpl.147 = The Server header for the http response.
webmanager.connector.editConnector.TomcatManagerImpl.149 = The size (in bytes) of the buffer to be provided for socket output buffering. -1 can be specified to disable the use of a buffer.
webmanager.connector.editConnector.TomcatManagerImpl.151 = If set to true, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances.
@@ -645,13 +645,13 @@
webmanager.connector.editConnector.TomcatManagerImpl.169 = When turning SSLEnabled value to true you will want to set the scheme attribute as well to pass the correct request.getScheme() to the servlets
webmanager.connector.editConnector.TomcatManagerImpl.170 = When turning SSLEnabled value to true you will want to set the secure attribute as well to pass the correct request.isSecure() values to the servlets
webmanager.connector.editConnector.TomcatManagerImpl.17 = Name of the file that contains the server certificate. The format is PEM-encoded.
-webmanager.connector.editConnector.TomcatManagerImpl.171 = A comma separated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
-webmanager.connector.editConnector.TomcatManagerImpl.173 = The alias used to for the server certificate in the keystore. If not specified the first key read in the keystore will be used.
+webmanager.connector.editConnector.TomcatManagerImpl.171 = A comma-separated list of the encryption ciphers that may be used. If not specified, any available cipher may be used.
+webmanager.connector.editConnector.TomcatManagerImpl.173 = The alias used to for the server certificate in the keystore. If not specified, the first key read in the keystore will be used.
webmanager.connector.editConnector.TomcatManagerImpl.175 = The TrustStore file to use to validate client certificates.
webmanager.connector.editConnector.TomcatManagerImpl.177 = The password to access the TrustStore.
webmanager.connector.editConnector.TomcatManagerImpl.179 = Set the truststore type. There is normally no reason not to use the default (JKS).
webmanager.connector.editConnector.TomcatManagerImpl.181 = Use this attribute to enable or disable sendfile capability.
-webmanager.connector.editConnector.TomcatManagerImpl.183 = Set to true to use the NIO thread pool executor. The default value is true. If set to false, it uses a thread pool based on a stack for its execution. Generally, using the executor yields a little bit slower performance, but yields a better fairness for processing connections in a high load environment as the traffic gets queued through a FIFO queue. If set to true(default) then the max pool size is the maxThreads attribute and the core pool size is the minSpareThreads. This value is ignored if the executor attribute is present and points to a valid shared thread pool.
+webmanager.connector.editConnector.TomcatManagerImpl.183 = Set to true to use the NIO thread pool executor. The default value is true. If set to false, it uses a thread pool based on a stack for its execution. Generally, using the executor yields a little bit slower performance, but yields a better fairness for processing connections in a high load environment as the traffic gets queued through a FIFO queue. If set to true(default), the max pool size is the maxThreads attribute and the core pool size is the minSpareThreads. This value is ignored if the executor attribute is present and points to a valid shared thread pool.
webmanager.connector.editConnector.TomcatManagerImpl.185 = The number of threads to be used to accept connections. Increase this value on a multi-CPU machine, although you would never really need more than 2. Also, with a lot of non-keep-alive connections, you might want to increase this value as well.
webmanager.connector.editConnector.TomcatManagerImpl.187 = The number of threads to be used to run for the polling events.
webmanager.connector.editConnector.TomcatManagerImpl.189 = The priority of the poller threads.
@@ -686,7 +686,7 @@
webmanager.connector.editConnector.TomcatManagerImpl.241 = The max selectors to be used in the pool, to reduce selector contention. Use this option when the command line org.apache.tomcat.util.net.NioSelectorShared value is set to false.
webmanager.connector.editConnector.TomcatManagerImpl.243 = The max spare selectors to be used in the pool, to reduce selector contention. When a selector is returned to the pool, the system can decide to keep it or let it be GC:ed. Use this option when the command line org.apache.tomcat.util.net.NioSelectorShared value is set to false.
webmanager.connector.editConnector.TomcatManagerImpl.245 = The following command line options are available for the NIO connector: <br><i>-Dorg.apache.tomcat.util.net.NioSelectorShared=true|false</i>. Set this value to false if you wish to use a selector for each thread. the property. If you do set it to false, you can control the size of the pool of selectors by using the selectorPool.maxSelectors attribute
-webmanager.connector.editConnector.TomcatManagerImpl.247 = The NIO connector implements an OutOfMemoryError strategy called parachute. It holds a chunk of data as a byte array. In case of an OOM, this chunk of data is released and the error is reported. This will give the VM enough room to clean up. The oomParachute represent the size in bytes of the parachute(the byte array). The default value is 1024*1024(1MB). Please note, this only works for OOM errors regarding the Java Heap space, and there is absolutely no guarantee that you will be able to recover at all. If you have an OOM outside of the Java Heap, then this parachute trick will not help.
+webmanager.connector.editConnector.TomcatManagerImpl.247 = The NIO connector implements an OutOfMemoryError strategy called parachute. It holds a chunk of data as a byte array. In case of an OOM, this chunk of data is released and the error is reported. This will give the VM enough room to clean up. The oomParachute represent the size in bytes of the parachute(the byte array). The default value is 1024*1024(1MB). Note, this only works for OOM errors regarding the Java Heap space, and there is absolutely no guarantee that you will be able to recover at all. If you have an OOM outside of the Java Heap, this parachute trick will not help.
webmanager.connector.editConnector.TomcatManagerImpl.249 = Duration of a poll call. Lowering this value will slightly decrease latency of connections being kept alive in some cases, but will use more CPU as more poll calls are being made.
webmanager.connector.editConnector.TomcatManagerImpl.251 = Amount of sockets that the poller responsible for polling kept alive connections can hold at a given time. Extra connections will be closed right away.
webmanager.connector.editConnector.TomcatManagerImpl.253 = Use kernel level sendfile for certain static files.
@@ -717,7 +717,7 @@
webmanager.connector.editConnector.TomcatManagerImpl.92 = If this Connector is being used in a proxy configuration, configure this attribute to specify the server port to be returned for calls to request.getServerPort().
webmanager.connector.editConnector.TomcatManagerImpl.94 = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
webmanager.connector.editConnector.TomcatManagerImpl.97 = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL.
-webmanager.connector.editConnector.TomcatManagerImpl.99 = This specifies if the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x, where the encoding specified in the contentType, or explicitly set using Request.setCharacterEncoding method was also used for the parameters from the URL.
+webmanager.connector.editConnector.TomcatManagerImpl.99 = This specifies whether the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x, where the encoding specified in the contentType, or explicitly set using Request.setCharacterEncoding method was also used for the parameters from the URL.
webmanager.connector.editConnector.addNew = Add a new
webmanager.connector.editConnector.attribute = Attribute
webmanager.connector.editConnector.desc = Description
@@ -739,7 +739,7 @@
webmanager.help.disableExplanation = Turn off statistics gathering and return the user to the main page.
webmanager.help.refreshExplanation = Update the display with the latest statistics.
webmanager.help.resetExplanation = Reset all counts, totals, averages, etc., to 0 and start gathering statistics again.
-webmanager.help.title = Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click on the enable link to monitor the performance of the Geronimo server.
+webmanager.help.title = Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click the enable link to monitor the performance of the Geronimo server.
webmanager.normal.activeRequestCount = Active Request Count
webmanager.normal.avgTime = Avg Time (ms)
webmanager.normal.connectionDuration = Connection Duration
@@ -765,9 +765,9 @@
webmanager.normal.totalTime = Total Time
welcome.welcomeMaximized.fragment1 = The welcome portlet is the first page that users see when they log in to the Administrative Console. It contains introductory information about the Administrative Console.
-welcome.welcomeMaximized.fragment2 = To return to the main Welcome panel select the "view" link from the header of this portlet.
+welcome.welcomeMaximized.fragment2 = To return to the main Welcome panel, select the "view" link from the header of this portlet.
welcome.welcomeMaximized.title = Welcome to the Apache Geronimo™ Administration Console!
-welcome.welcomeNormal.about1 = The administration console provides a convenient, user friendly way to administer many aspects of the Geronimo Server. It is currently a work in progress, and will continue to evolve over time. The navigation panel on the left-hand side of the screen provides easy access to the individual tasks available in the console.
+welcome.welcomeNormal.about1 = The administration console provides a convenient way to administer many aspects of the Geronimo Server. It is currently a work in progress, and will continue to evolve over time. The navigation panel on the left-hand side of the screen provides easy access to the individual tasks available in the console.
welcome.welcomeNormal.about2 = This space is the main content area where the real work happens. Each view contains one or more portlets (self contained view fragments) that typically include a link for help in the header. Look at the top of this portlet for an example and try it out.
welcome.welcomeNormal.about3 = The references on the right are provided so that you can learn more about Apache Geronimo, its capabilities, and what might be coming in future releases.
welcome.welcomeNormal.about4 = Mailing lists are available to get involved in the development of Apache Geronimo or to ask questions of the community:
Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:10:25 2009
@@ -26,7 +26,6 @@
Applications = Applications
Artifact-Aliases = Artifact-Aliases
-
Certificate\ Authority = Certificate Authority
Certification\ Authority = Certification Authority
@@ -58,7 +57,6 @@
Installed\ Web\ Applications = Installed Web Applications
J2EE\ Connectors = J2EE Connectors
-
JAR\ Aliases = JAR Aliases
Java\ System\ Info = Java System Info
@@ -134,7 +132,7 @@
consolebase.errorMsg21 = Unable to get next serial number from CA.
consolebase.errorMsg22 = Errors in user input while processing a CSR.
consolebase.errorMsg23 = Errors encountered while issuing certificate.
-consolebase.errorMsg24 = Default properties-login module does not exist, it may be replaced by a customized login module.
+consolebase.errorMsg24 = Default properties-login module does not exist, it might be replaced by a customized login module.
consolebase.infoMsg01 = Started application
consolebase.infoMsg02 = Stopped application
consolebase.infoMsg03 = Restarted application
@@ -158,6 +156,6 @@
consolebase.warnMsg03 = Web statistics are not supported for the current web container.
consolebase.warnMsg04 = Statistics are not currently being collected.
consolebase.warnMsg05 = CA is not running or CA may not have been initialized. Unable to lock CA.
-consolebase.warnMsg06 = A certificate with the serial number <b>{0}</b> has already been issued. You may be seeing this message since you have clicked on 'Issue Certificate' button a second time.
+consolebase.warnMsg06 = A certificate with the serial number <b>{0}</b> has already been issued. You might be seeing this message since you have clicked 'Issue Certificate' button a second time.
consolebase.warnMsg07 = <p style='font-size:120%;'><b>A shutdown of the server will disable this Web Console! Proceed only if you are certain you want to terminate the server.</b></p>
consolebase.warnMsg08 = There are no Web Containers defined.
Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties Mon Dec 7 08:10:25 2009
@@ -23,4 +23,4 @@
tooltip.mode.help = Help
tooltip.mode.edit = Edit
-tooltip.css.classname = tooltip
\ No newline at end of file
+tooltip.css.classname = Tooltip
\ No newline at end of file
Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties Mon Dec 7 08:10:25 2009
@@ -21,12 +21,12 @@
console.common.loginToConsole = Log in to the Geronimo Console
console.common.pages = Pages
console.common.password = Password
-console.common.username = Username
+console.common.username = User Name
console.head.title = Geronimo Console
console.login.components = <strong>Geronimo™</strong> has integrated the following components:<BR/> • Application server (Apache Geronimo)<br/> • Web server and servlet engine (Tomcat)<br/> • Web server and servlet engine (Jetty)<br/> • JSP compiler (Jasper)<br/> • JAX-RPC Web Services engine (Apache Axis)<br/> • JAX-WS Web Services engine (Apache Axis2)<br/> • JAX-WS Web Services engine (Apache CXF)<br/> • Relational database (Apache Derby)<br/> • Messaging (ActiveMQ)<br/> • User management services<br/> • Centralized administration console<br/>
console.login.introduction = <strong>GERONIMO™</strong> is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance.
-console.login.requireCookies = Note: Logging onto the Geronimo Console requires cookies to be enabled in your web browser.
+console.login.requireCookies = Note: To log in to the Geronimo Console, cookies must be enabled in your web browser.
console.login.welcome = Welcome to the Geronimo™ Console
-console.login_error.invalid = Invalid Username and/or Password!
+console.login_error.invalid = Invalid User Name and/or Password!
console.login_success.loginSuccessful = Login Successful
console.login_success.returnToPortalTests = Click here to return to the portal tests.
Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp (original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp Mon Dec 7 08:10:25 2009
@@ -35,7 +35,7 @@
An assembly process has been developed to add these records to web.xml using Maven 2 (the
pluto:assemble goal in maven-pluto-plugin) or Ant (AssembleTask).
See the testsuite web.xml file for an example how the servlet and servlet-mapping
-records should look like after assembly (other items the developer adds to web.xml should be
+records should look like after assembly (other items that the developer adds to web.xml should be
carried forward into the updated file).
</p>
@@ -52,25 +52,29 @@
<div class="portlet-section-subheader">Deploying a Portlet Application</div>
<p class="portlet-font">
- The way to deploy a portlet application depends on the app server Pluto is running in. In the bundled distribution
- Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
- war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to
- the manager app in the bundled distribution (this link can be changed for other app servers -- see the
- adjacent Help link). In the bundled distribution of Pluto, you can also simply drop the portlet application war into Tomcat's
+ The way to deploy a portlet application depends on the app server that Pluto is running in. In the bundled distribution
+ Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
+ war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to
+ the manager app in the bundled distribution (this link can be changed for other app servers -- see the
+ adjacent Help link). In the bundled distribution of Pluto, you can also simply drop the portlet application war into Tomcat's
webapp directory.
</p>
<div class="portlet-section-subheader">Adding Portlets to a Portal Pages</div>
<p class="portlet-font">
-Adding portlets to a portal page using the Pluto Page Administrator portlet involves first selecting a portal
-page using the Portal Pages drop-down and then selecting a portlet application using the Portlet Applications
-drop-down and finally a portlet in the adjacent drop down. When this is done, click the Add Portlet button.
+To Add portlets to a portal page using the Pluto Page Administrator portlet, take the following steps:
+Select a portal page using the Portal Pages drop-down.
+Select a portlet application using the Portlet Applications drop-down
+Select a portlet in the adjacent drop down.
+Click the Add Portlet button.
</p>
<div class="portlet-section-subheader">Removing Portal Pages</div>
<p class="portlet-font">
-Removing portlets from a portal page involves selecting a portal page using the Portal Pages drop-down, selecting
-the portlet in the adjacent list and then clicking on the Remove Page button.
+To remove portlets from a portal page, take the following steps:
+Select a portal page using the Portal Pages drop-down.
+Select the portlet in the adjacent list.
+Click the Remove Page button.
</p>
@@ -99,10 +103,10 @@
<%-- Properties for link to app server deployer and help mode file --%>
<fmt:bundle basename="AdminPortlet">
- <fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
+ <fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
</fmt:bundle>
<portlet:renderURL portletMode="help" var="deployerhelpURL">
- <portlet-el:param name="helpPage" value="${deployerHelp}"/>
+ <portlet-el:param name="helpPage" value="${deployerHelp}"/>
</portlet:renderURL>
<p class="portlet-font">
Modified: geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties Mon Dec 7 08:10:25 2009
@@ -19,8 +19,8 @@
ajax.progressbar.processing = å¤çä¸...
car.addRepository.currentlyPluginRepositories = å½åå¯ç¨çæ件ä»åºæ
-car.addRepository.downloadRunningCongfig = ä½ ä¹å¯ä»¥å°±åæµè§å¹¶å®è£
第ä¸æ¹æ件ä¸æ ·ä»å¦ä¸ä¸ªGeronimoæå¡å¨ä¸ä¸è½½è¿è¡æ¶çé
ç½®ï¼å¦æä½ è¦æåè¿ç¨Geronimoæå¡å¨ï¼å¨ä¸é¢è¾å
¥ç±»ä¼¼<tt>http://geronimo-server:8080/plugin/maven-repo/</tt>çURL
-car.addRepository.howToAddPluginRepositories = è¦æ·»å ä¸ä¸ªæ°çæ件ä»åºå°å表ä¸ï¼å¨ä¸é¢çææ¬æ¡ä¸è¾å
¥ä»åºçURLãä»åºç顶å±ç®å½ä¸å¿
é¡»æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件ï¼æ件ä¸ååºäºè¯¥åä»ä¸å¯ç¨çæ件ã
+car.addRepository.downloadRunningCongfig = ä½ ä¹å¯ä»¥å°å¦ä¸ä¸ª Geronimo æå¡å¨ä¸çæ件ä»åºæ·»å å°å½åæå¡å¨ä¸ãå¦æä½ è¦æ·»å ä¸ä¸ªè¿ç¨ Geronimo æå¡å¨ä¸çæ件ä»åºï¼å¨ä¸é¢ææ¬æ¡ä¸è¾å
¥è¦æ·»å çæ件ä»åºçé¾æ¥å°åï¼å¦ <tt>http://geronimo-server:8080/plugin/maven-repo/</tt>
+car.addRepository.howToAddPluginRepositories = è¦æ·»å ä¸ä¸ªæ°çæ件ä»åºå°å表ä¸ï¼å¨ä¸é¢çææ¬æ¡ä¸è¾å
¥è¯¥ä»åºçé¾æ¥å°åãä»åºçæ ¹ç®å½ä¸å¿
é¡»å
å«ä¸ä¸ª<tt>geronimo-plugins.xml</tt> æ件以ååºè¯¥åä»ä¸å¯ç¨çæ件ã
car.addRepository.title = æ·»å æ件ä»åº
car.assemblyConfirm.description = æè¿°
car.assemblyConfirm.moduleId = 模åID
@@ -30,68 +30,68 @@
car.common.assemble = ç»è£
car.common.author = ä½è
car.common.category = ç§ç±»
-car.common.createGeronimoPlugin = å建Geronimoæ件
+car.common.createGeronimoPlugin = å建 Geronimo æ件
car.common.dependencies = ä¾èµé¡¹
car.common.downloadRepositories = å·²ä¸è½½çåå¨åº
car.common.exportPlugin = 导åºæ件
-car.common.geronimoVersions = Geronimoçæ¬
+car.common.geronimoVersions = Geronimo çæ¬
car.common.group = ç»
car.common.license = 许å¯è¯
car.common.moduleID = 模åID
car.common.newRepository = æ°çåå¨åº
car.common.obsoletes = åºå¼
car.common.openSource = å¼æ¾æºç
-car.common.pluginURL = æ件çURL
-car.common.prereq1Description = å
å³æ¡ä»¶1æè¿°
-car.common.prereq2Description = å
å³æ¡ä»¶2æè¿°
-car.common.prereq3Description = å
å³æ¡ä»¶3æè¿°
-car.common.prerequisite1ID = å
å³æ¡ä»¶1ID
-car.common.prerequisite1Type = å
å³æ¡ä»¶1ç±»å
-car.common.prerequisite2ID = å
å³æ¡ä»¶2ID
-car.common.prerequisite2Type = å
å³æ¡ä»¶2ç±»å
-car.common.prerequisite3ID = å
å³æ¡ä»¶3ID
-car.common.prerequisite3Type = å
å³æ¡ä»¶3ç±»å
+car.common.pluginURL = æ件ç URL
+car.common.prereq1Description = å
å³æ¡ä»¶ 1 æè¿°
+car.common.prereq2Description = å
å³æ¡ä»¶ 2 æè¿°
+car.common.prereq3Description = å
å³æ¡ä»¶ 3 æè¿°
+car.common.prerequisite1ID = å
å³æ¡ä»¶ 1 ID
+car.common.prerequisite1Type = å
å³æ¡ä»¶ 1 ç±»å
+car.common.prerequisite2ID = å
å³æ¡ä»¶ 2 ID
+car.common.prerequisite2Type = å
å³æ¡ä»¶ 2 ç±»å
+car.common.prerequisite3ID = å
å³æ¡ä»¶ 3 ID
+car.common.prerequisite3Type = å
å³æ¡ä»¶ 3 ç±»å
car.common.prerequisites = å
å³æ¡ä»¶
car.common.proprietary = æææ
-car.common.removePlugins = å é¤Geronimoçæ件
+car.common.removePlugins = å é¤ Geronimo çæ件
car.common.repository = åå¨åº
car.common.savePluginData = ä¿åæ件é
ç½®
-car.common.searchForPlugins = æç´¢æ件
-car.common.uniqueID = å¯ä¸çID
+car.common.searchForPlugins = æ¾ç¤ºæéä»åºä¸çæ件
+car.common.uniqueID = å¯ä¸ç ID
car.common.viewDetails = æ¾ç¤ºç»è
-car.common.webSite = Webç«ç¹
+car.common.webSite = Web ç«ç¹
car.confirmExport.title = <b>导åºæ件</b> -- ä¿åå°ç£ç
-car.confirmExport.useBtnBelow = 使ç¨ä¸é¢è¿ä¸ªæé®å°æ件"{0}"ä¿åå°ç£çã
-car.download.foundDependencies = ä¸é¢æ¯æ¾å°çè¿ä¸ªæ件çä¾èµé¡¹ãå¦æä½ ç»§ç»çè¯ï¼å°ä¼èªå¨å°å®è£
ä»»ä½ç¼ºå°çä¾èµé¡¹ã
+car.confirmExport.useBtnBelow = åå»ä¸é¢è¿ä¸ªæé®å°æ件"{0}"ä¿åå°ç£çã
+car.download.foundDependencies = æå¡å¨ä¸ºæ¤æ件æ¾å°äºä»¥ä¸ä¾èµé¡¹ãå¦æä½ ç»§ç»çè¯ï¼æå¡å¨å°ä¼èªå¨å°å®è£
æéçä¾èµé¡¹ã
car.download.processing = å¤ç{0}ä¸...
car.downloadStatus.processing = æ£å¨å¤ç{0}...
-car.help.return = åå»portlet头é¨ç'è§å¾'é¾æ¥ä»¥è¿åæ件主é¢æ¿
+car.help.return = åå»æ¤ portlet å³ä¸è§çâè§å¾âé¾æ¥ä»¥è¿åæ件主é¢æ¿
car.index.assembleServer = ç»è£
æå¡å¨
car.index.assembleServerLong = 使ç¨è¿éçæ件ç»è£
æå¡å¨
-car.index.assemblyHelp.AppCentric.desp = éæ©ç¬¦åä½ éè¦çåºç¨æä»¶å¹¶ä»¥ä½ çåºç¨æ件为ä¸å¿å®ä¹æå¡å¨çå
容ãä½ çæå¡å¨åºè¯¥è½å¤è¿è¡ä½ çåºç¨ä½å¯è½æ æ³é¨ç½²å
¶ä»ä»»ä½åºç¨ã
+car.index.assemblyHelp.AppCentric.desp = éæ©ä½ æ³è¦ç»è£
å°ä½ çæå¡å¨ä¸çåºç¨æ件ãä½ æéæ©çåºç¨æ件å°å³å®æç»è£
æå¡å¨æç»çè½è½ãä½ çæå¡å¨å°è½å¤è¿è¡ä½ çåºç¨æ件ï¼ä½å¯è½æ æ³é¨ç½²å
¶ä»ä»»ä½åºç¨ç¨åºã
car.index.assemblyHelp.AppCentric.title = 以åºç¨ä¸ºä¸å¿ç
-car.index.assemblyHelp.ExpertUser.desp = æç
§ ConfigId éæ©åºç¨æ件åç³»ç»æ件以æå»ºä½ çæå¡å¨ã请ä»
å¨ä½ æ¯ Apache Geronimo çä¸å®¶ç¨æ·æ¶éæ©è¿ä¸ªæ¨¡å¼ï¼å¦åä½ æåå¾å°çå¯è½æ¯ä¸ä¸ªæ æ³å¯å¨åé¨ç½²ä»»ä½åºç¨çæå¡å¨.
-car.index.assemblyHelp.ExpertUser.title = ä¸å®¶ç¨æ·
-car.index.assemblyHelp.FuncCentric.desp = éæ©ç¬¦åä½ éè¦çåè½ä»¥åä»»ä½å·²é¨ç½²çåºç¨æ件
+car.index.assemblyHelp.ExpertUser.desp = éæ©åºç¨æ件åç³»ç»æ件æ¥ç»è£
ä½ çæå¡å¨ã注æï¼ä½ å¿
é¡»æ¯ Apache Geronimo çä¸å®¶çº§ç¨æ·æå¯ä»¥éæ©è¿ä¸ªæ¨¡å¼ï¼å¦åä½ æåå¾å°çå¯è½æ¯ä¸ä¸ªæ æ³å¯å¨åé¨ç½²ä»»ä½åºç¨çæå¡å¨.
+car.index.assemblyHelp.ExpertUser.title = ä¸å®¶çº§ç¨æ·
+car.index.assemblyHelp.FuncCentric.desp = éæ©ç¬¦åä½ éè¦çåè½ä»¥å对åºçæ件æ¥ç»è£
æå¡å¨
car.index.assemblyHelp.FuncCentric.title = 以åè½ä¸ºä¸å¿ç
-car.index.assemblyHelp.desp = 使ç¨å½åæå¡å¨ä¸ç Geronimo æ件ç»è£
ä¸ä¸ªæå¡å¨ã请éæ©å¦ä¸ä¸ç§æ¨¡å¼ä¸çä¸ç§:
-car.index.assemblyHelp.note = <p>请注æè¿ä¸ªportletåªéç¨äºgeronimoæ件. å¦æä½ çåºç¨ä¸æ¯ä¸ä¸ªgeronimoæ件, ä½ æå¦ä¸éæ©:</p><p>- 使ç¨æ§å¶å°ç"å建æ件"portletå°ä½ çåºç¨è½¬æ¢ä¸ºä¸ä¸ªgeronimoæ件<br/>- 使ç¨car-maven-pluginå°ä½ çåºç¨è½¬æ¢ä¸ºä¸ä¸ªgeronimoæ件<br/>- ç»è£
ä½ çæå¡å¨ååé¨ç½²ä½ çåºç¨<br/></p>
+car.index.assemblyHelp.desp = å©ç¨å½åæå¡å¨ä¸ç Geronimo æ件ç»è£
ä¸ä¸ªæ°çæå¡å¨ãä½ å¯ä»¥éæ©å¦ä¸ä¸ç§æ¨¡å¼ä¸çä¸ç§:
+car.index.assemblyHelp.note = <p>请注ææ¤ portlet åªéç¨äº Geronimo æ件. å¦æä½ çåºç¨ä¸æ¯ä¸ä¸ª Geronimo æ件, ä½ æå¦ä¸éæ©:</p><p>- 使ç¨æ§å¶å°ç"å建æ件"åè½å°ä½ çåºç¨è½¬æ¢ä¸ºä¸ä¸ª Geronimo æ件<br/>- ä½¿ç¨ car-maven-plugin å°ä½ çåºç¨è½¬æ¢ä¸ºä¸ä¸ª Geronimo æ件<br/>- ç»è£
ä½ çæå¡å¨ååé¨ç½²ä½ çåºç¨<br/></p>
car.index.assemblyMode = èªå®ä¹ç»è£
模å¼:
-car.index.createGeronimoPluginExp = éæ©è¦å¯¼åºç Geronimo æ件ã导åºåçæ件å°ä»¥ CAR æ件çå½¢å¼ä¿åå°ä½ çæ¬å°æ件系ç»ä¸ã<i>注æï¼å¨ä½ å°å®å¯¼åºåï¼è¦ä½¿å®æ为ä¸ä¸ªææçæ件ï¼ä½ å¿
é¡»æå¨å°<tt>META-INF/geronimo-plugin.xml</tt>æ件添å å° CAR ä¸ã</i>
+car.index.createGeronimoPluginExp = éæ©è¦å¯¼åºç Geronimo æ件ã导åºåçæ件å°ä»¥ CAR æ件çå½¢å¼ä¿åå°ä½ çæ¬å°æ件系ç»ä¸ã<i>注æï¼å¨ä½ å°å®å¯¼åºåï¼è¦ä½¿å®æ为ä¸ä¸ªææçæ件ï¼ä½ å¿
é¡»æå¨å°<tt>META-INF/geronimo-plugin.xml</tt>æ件添å å° CAR ä¸ã</i>
car.index.createPluginHelp.desp = <p>ä»å½åGeronimo æå¡å¨ä¸å¯¼åº Geronimoæ件ã å¡«åæ件å
æ°æ®ä¿¡æ¯å¹¶å°æ件ä¿å为ä¸ä¸ª CAR æ件å°ä½ çæ¬å°æ件系ç»ãæ§å¶å°å°çæ<tt>geronimo-plugin.xml</tt>æ件以åå¨ä½ æ导åºæ件çå
æ°æ®ä¿¡æ¯å¹¶å°æ件æå
è¿ä¸ä¸ª CAR æ件ã ä½ å¯ä»¥éè¿ç®¡çæ§å¶å°è®¾ç½®å¾å¤æ件å
æ°æ®ï¼ç¶èï¼ä½ æ æ³æ´æ¹æäºé«çº§è®¾ç½®, ä¾å¦<tt>config-xml-content</tt>æè
<tt>config-substitution properties</tt>ã</p><p>å¦æä½ ä½¿ç¨å½ä»¤è¡æ¹å¼çæä¸ä¸ª Geronimo æ件,
ä½ å¯ä»¥å
ä½¿ç¨ car-maven-plugi nä¸ºä½ ç项ç®äº§çä¸ä¸ª<tt>geronimo-plugin.xml</tt>æ件, ç¶åå°ä½ ç项ç®æå
为ä¸ä¸ª CAR æ件, 并åæ¶å°ä½ ç项ç®ä¿¡æ¯èªå¨æ·»å å° Geronimo æ件ç®å½ï¼<tt>geronimo-plugins.xml</tt> æ件ï¼ã</p>
-car.index.createPluginHelp.title = å建geronimoæ件
-car.index.installPluginHelp.desp = <p>ä»æ¬å°æè¿ç¨æå¡å¨åå½åGeronimoæå¡å¨å®è£
geronimoæ件.</p> <p>ç¹å» "æ´æ°åå¨åºå表" é¾æ¥ä»¥å°åå¨åºå表æ´æ°å°æå¡å¨æ¨èçææ°ç.</p> <p>å¦æä½ æ²¡æçå°ææçåå¨åº, ç¹å» "æ·»å åå¨åº" é¾æ¥ä»¥æ·»å ä½ éæ©çéå åå¨åº. åå¨åºå¿
é¡»å¨æ ¹ç®å½æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件ååºåå¨åºä¸çå¯ç¨æ件. </p>
-car.index.installPluginHelp.title = å®è£
geronimoæ件
+car.index.createPluginHelp.title = å建 Geronimo æ件
+car.index.installPluginHelp.desp = <p>ä»æ¬å°æè¿ç¨æå¡å¨åå½å Geronimo æå¡å¨å®è£
Geronimo æ件.</p> <p>ç¹å» "æ´æ°åå¨åºå表" é¾æ¥ä»¥å°åå¨åºå表æ´æ°å°æå¡å¨æ¨èçææ°ç.</p> <p>å¦æä½ æ²¡æçå°ææçåå¨åº, ç¹å» "æ·»å åå¨åº" é¾æ¥ä»¥æ·»å ä½ éæ©çéå åå¨åº. åå¨åºå¿
é¡»å¨æ ¹ç®å½æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件ååºåå¨åºä¸çå¯ç¨æ件. </p>
+car.index.installPluginHelp.title = å®è£
Geronimo æ件
car.index.optionalAuthentication = å¯ééªè¯ä¿¡æ¯
-car.index.removePluginsExp = è¦å é¤ä¸ä¸ªæ件ï¼å¨<b>åºç¨ç¨åº</b>ä¸çç±»å«ä¸æ¾å°æ件模å并å¸è½½å®ã
-car.index.summary = <h2>å®è£
Geronimo æ件</h2> <p>è¿ä¸ªportlet ç¨äºå®è£
Geronimo æ件ã éè¿è¿æ ·å°±å¯ä»¥å¨è¿è¡æ¶ä¸º Geronimo æå¡å¨å®è£
æ°çåè½ã</p> <p>éæ©ä¸ä¸ªæ¬å°æè¿ç¨çåå¨åºå¹¶æ£æ¥å¯ç¨çGeronimoæ件ã è¿ä¸ªåå¨åºçæ ¹ç®å½ä¸å¿
é¡»æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件以æ¾ç¤ºåå¨åºä¸çææå¯ç¨æ件ã</p> <p>ä½ ä¹å¯ä»¥ä»å
¶å®Geronimoæå¡å¨ä¸è½½è¿è¡ä¸ç设置就åæµè§åå®è£
第3æ¾æ件ä¸æ ·. å¦æä½ æ³æåä¸ä¸ªè¿ç¨çGeronimoæå¡å¨, è¾
å
¥ä¸ä¸ªURL,类似äº<tt>http://geronimo-server:8080/plugin/maven-repo/</tt>并å¨å¯éçéªè¯åä¸è¾å
¥ç®¡çåçç¨æ·ååå¯ç .</p>
+car.index.removePluginsExp = è¦å é¤ä¸ä¸ªæ件ï¼å¨<b>åºç¨ç¨åº</b> portlet ä¸æ¾å°æ件模å并å°å®å¸è½½ã
+car.index.summary = <h2>å®è£
Geronimo æ件</h2> <p>è¿ä¸ª portlet ç¨äºå®è£
Geronimo æ件ã éè¿è¿æ ·å°±å¯ä»¥å¨è¿è¡æ¶ä¸º Geronimo æå¡å¨å®è£
æ°çåè½ã</p> <p>éæ©ä¸ä¸ªæ¬å°æè¿ç¨çåå¨åºå¹¶æ£æ¥å¯ç¨çGeronimoæ件ã è¿ä¸ªåå¨åºçæ ¹ç®å½ä¸å¿
é¡»æä¸ä¸ª<tt>geronimo-plugins.xml</tt>æ件以æ¾ç¤ºåå¨åºä¸çææå¯ç¨æ件ã</p> <p>ä½ ä¹å¯ä»¥ä»å
¶å® Geronimo æå¡å¨ä¸è½½è¿è¡ä¸ç设置就åæµè§åå®è£
第ä¸æ¹æ件ä¸æ ·. å¦æä½ æ³æåä¸ä¸ªè¿ç¨ç Geronimo æå¡å
¨, è¾å
¥ä¸ä¸ª URL ,类似äº<tt>http://geronimo-server:8080/plugin/maven-repo/</tt>并å¨å¯éçéªè¯åä¸è¾å
¥ç®¡çåçç¨æ·ååå¯ç .</p>
car.index.updateRepositoryList = æ´æ°åå¨åºå表
car.index.validateConfig = 请éæ©è¦å¯¼åºç设置.
car.list.PluginGroup = æ¬å°æå¡å¨çæ件ç»:
car.list.applicationPlugin = æ¬å°æå¡å¨çåºç¨æ件:
-car.list.assemblyArtifactId = æ°æå¡å¨å·¥ä»¶ID:
+car.list.assemblyArtifactId = æ°æå¡å¨å·¥ä»¶ ID:
car.list.assemblyFormat = æ°æå¡å¨æ ¼å¼:
-car.list.assemblyGroupId = æ°æå¡å¨ç»ID:
+car.list.assemblyGroupId = æ°æå¡å¨ç» ID:
car.list.assemblyPath = æ°æå¡å¨ä¿åè·¯å¾:
car.list.assemblyVersion = æ°æå¡å¨çæ¬:
car.list.expertUser = ä¸å®¶ç¨æ·(æ¾ç¤ºææç³»ç»æ件)
@@ -100,11 +100,11 @@
car.list.noPlugins = æ¤åå¨åºä¸æ²¡ææ件.
car.list.nothing = ä½ è³å°è¦éæ©ä¸ä¸ªæ件以å®è£
ã
car.list.pluginRepo = æ件ä½äº
-car.list.requireArtifactId = ä½ å¿
é¡»æä¾å·¥ä»¶IDã
+car.list.requireArtifactId = ä½ å¿
é¡»æä¾å·¥ä»¶ IDã
car.list.requiredPlugin = æ¬å°æå¡å¨æéæ件:
car.list.selectPlugin = ä»å½åæå¡å¨éæ©æ件:
car.list.systemPlugin = æ¬å°æå¡å¨çç³»ç»æ件:
-car.pluginParams.JVMVersionsExp = ä¸ä¸ªå¯éçå表ï¼ç¨äºååºè¿ä¸ªæ件æ¯æçJVMçæ¬çåç¼ãå¦æ没æååºä»»ä½å¼çè¯ï¼è¿ä¸ªæ件å¯å®è£
å¨è¿è¡äºä»»ä½çæ¬çJVMçGeronimoä¸ãä¸ç¶çè¯ï¼æ¯ä¸è¡ååºä¸ä¸ªå¯æ¥åçJVMçæ¬åç¼ï¼å°±å"1.4.2 1.5 ..." (å½ç¶ï¼çæ³æ
åµä¸ï¼è¿æå³çå¨è¿éååºçJVNçæ¬ä¸ï¼ä½ ç¡®å®å·²ç»æµè¯è¿è¿ä¸ªæ件)ã
+car.pluginParams.JVMVersionsExp = ä¸ä¸ªå¯éçå表ï¼ç¨äºååºè¿ä¸ªæ件æ¯æçJVMçæ¬çåç¼ãå¦æ没æååºä»»ä½å¼çè¯ï¼è¿ä¸ªæ件å¯å®è£
å¨è¿è¡äºä»»ä½çæ¬çJVMçGeronimoä¸ãä¸ç¶çè¯ï¼æ¯ä¸è¡ååºä¸ä¸ªå¯æ¥åç JVM çæ¬åç¼ï¼å°±å"1.4.2 1.5 ..." (å½ç¶ï¼çæ³æ
åµä¸ï¼è¿æå³çå¨è¿éååºç JVM çæ¬ä¸ï¼ä½ ç¡®å®å·²ç»æµè¯è¿è¿ä¸ªæ件)ã
car.pluginParams.authorExp = æ件çä½è
ï¼è¿å¯è½æ¯äººåï¼å
¬å¸åæè
å¼æºé¡¹ç®çå称ççã
car.pluginParams.categoryExp = è¿ä¸ªæ件æå±çç±»å«ãåä¸ä¸ªç±»å«çæ件ä¼è¢«ä¸èµ·ååºãå¦ææ³è®©è¿ä¸ªæ件被åå¨ geronimoplugins.com ï¼ä½ åºè¯¥éæ©å
¶ä¸çä¸ä¸ªç±»å«ä½ä¸ºå称ãå¦å¤ï¼ä½ ä¹å¯ä»¥éæå°éæ©ç±»å«çå称ï¼æè
éç¨åå¨åºä¸å®è¦è¢«åå¸è³çé£ä¸ä¸ªç±»å«çå称ã
car.pluginParams.dependenciesExp = ä¸ä¸ªå表ï¼ç¨äºååºè¿ä¸ªæ件æä¾èµç JAR å
æå
¶ä»æ¨¡åç IDãå®è£
è¿ä¸ªæ件æ¶ï¼è¿äºä¾èµé¡¹å°ä¼èªå¨å°å®è£
ãé常ï¼ä½ ä¸åºè¯¥ä¿®æ¹è¿ä¸ªå表ãç¶èï¼å¦æç¨æ·å¨å®è£
è¿ä¸ªæ件åï¼å¿
é¡»å
æå¨å°å®è£
æ个ä¾èµé¡¹ï¼ä½ å¯ä»¥å°è¯¥ä¾èµé¡¹ä»ä¾èµå表ä¸ç§»å°<b>å
å³æ¡ä»¶</b>å表ä¸(ä¾å¦ï¼æ°æ®åºè¿æ¥æ± ï¼æ件æ¯æ æ³ç¥éè¦è¿æ¥å°åªä¸ªæå¡å¨ç)ã<br /><br />å¨è¿ä¸ªå表ä¸çæ¯ä¸ä¸ªæ¡
ç®åºè¯¥ä½¿ç¨åä¸é¢ä¸æ ·çå¯ä¸ ID ãå¦æä½ è®¤ä¸ºè¿ä¸ªæ件å¯ä»¥ä½¿ç¨ä»»ä½çæ¬çä¾èµé¡¹ï¼ä½ ä¹å¯ä»¥å é¤æçæ¬å·ï¼ä½è¿æ ·åå¯è½ä¼æé£é©ãæ¯ä¸ªä¾èµé¡¹åºè¯¥å¯¹åºä¸è¡å
容ã
@@ -116,23 +116,23 @@
car.pluginParams.licenseExp = è¿ä¸ªæ件使ç¨ç许å¯è¯ãçæ³æ
åµï¼å®åºè¯¥æ¯åç¼ä¸º BSD æè
GPL ç±»åç许å¯è¯ã
car.pluginParams.obsoletesExp = ä¸ä¸ªå表ï¼ç¨äºååºè¦è¢«è¯¥æ件æ¿æ¢ç模å IDãå½å®è£
è¿ä¸ªæ件æ¶ï¼è¿éååºç模åææ件ä¼è¢«å é¤ãå¦æä½ è¦å级èä¸æ¯æ¿æ¢åæçæ件ï¼å¯ä»¥å¨è¿éæä¾åææ件ççæ¬ä¿¡æ¯ãå表ä¸çæ¯ä¸è¡å¯¹åºä¸ä¸ªæ¨¡å IDã
car.pluginParams.openSourceExp = å¦æè¿ä¸ªè®¸å¯è¯æ¯æç±» OSI 认å¯çå¼æºè®¸å¯è¯çè¯ï¼éä¸è¿ä¸ªå¤éæ¡(åè<a href="http://www.opensource.org/licenses/index.php">http://www.opensource.org/licenses/index.php</a>)ã
-car.pluginParams.pluginURLExp = å¯ä»¥è·å¾æ件æ´å¤ä¿¡æ¯çURL(å¦æ件ç主页)ã
+car.pluginParams.pluginURLExp = å¯ä»¥è·å¾æ件æ´å¤ä¿¡æ¯ç URL (å¦æ件ç主页)ã
car.pluginParams.prereqDescriptionExp = ä¸æ®µè¾ä¸ºè¯¦å°½çæè¿°ï¼å
³äºç¨æ·è¦æ»¡è¶³âå
å³æ¡ä»¶âæå¿
é¡»è¦åçäºæ
ãï¼ä¾å¦ä¸äºå
³äºè®¾ç½®æ°æ®åºè¿æ¥æ± ç说æï¼ååºå¯æ¯æçæ°æ®åºäº§å并ä¸åè¯ç¨æ·å¨åªéè½æ¾å°åå§åæ°æ®åºçèæ¬ï¼ãè¿éåºè¯¥ä½¿ç¨ç¨ç©ºè¡åå²æ段è½çæ®éææ¬ã
car.pluginParams.prerequisiteIDExp = ä½ä¸ºè¿ä¸ªæ件å
å³æ¡ä»¶ç模å IDãå¨æ件被å®è£
ä¹åï¼æå¡å¨ä¸å¿
须已ç»åå¨è¿ä¸ªæ¨¡åãå¯è½æ¯æ个 Web åºç¨æéçç¹å® Web 容å¨(<tt>geronimo/jetty/*/car</tt>)ãæ°æ®åºè¿æ¥æ± æè
å®å
¨åä¿¡æ¯ãç±äºæ件çä½è
æ æ³ä¸ºç®æ æå¡å¨å建对åºäºè¿äºä¿¡æ¯çææå¼ï¼å æ¤ç¨æ·å¿
é¡»æå·¥é
ç½®ã为äºéåºå°½å¯è½å¤çç¨æ·éæ±ï¼ä½ å¯è½éè¦çç¥æ¨¡å ID ä¸çæäºå
容ï¼å¦ä½¿ç¨ <tt>*/mypool/*/*</tt> èä¸æ¯ <tt>myapp/
mypool/1.2/car</tt>ï¼ã
car.pluginParams.prerequisiteTypeExp = 为äºæ¹ä¾¿ç¨æ·ï¼å¯¹å
å³æ¡ä»¶çç±»åçç®çæè¿°ãå¯åçå¼å
æ¬<tt>Database Pool</tt> ï¼<tt>Web Container</tt>ççã
car.pluginParams.title = <b>导åºæ件</b> -- é
ç½®æ件
-car.pluginParams.uniqueIDExp = è¿ä¸ªæ件å
¨å±å¯ä¸çIDï¼è¿æ¯ç±ä½ è¦å¯¼åºçæå¡å¨å³å®çãè¿ä¸ªIDç¡®å®äºæ件ççæ¬å·ï¼æ以请确ä¿ä½ è¾å
¥çIDçæ£ç¡®æ§ã
+car.pluginParams.uniqueIDExp = è¿ä¸ªæ件å
¨å±å¯ä¸ç IDï¼è¿æ¯ç±ä½ è¦å¯¼åºçæå¡å¨å³å®çãè¿ä¸ª ID ç¡®å®äºæ件ççæ¬å·ï¼æ以请确ä¿ä½ è¾å
¥ç ID çæ£ç¡®æ§ã
car.results.filesProcessed = å·²å¤çæ件
car.results.titles = å·²å®è£
å¦ä¸æ件
car.viewForDownload.author = ä½è
car.viewForDownload.category = ç±»å«
car.viewForDownload.dependencies = ä¾èµ
car.viewForDownload.description = æè¿°
-car.viewForDownload.geronimoVersions = Geronimoçæ¬
+car.viewForDownload.geronimoVersions = Geronimo çæ¬
car.viewForDownload.installable = å¯å®è£
ç
-car.viewForDownload.jvmVersions = JVMçæ¬
+car.viewForDownload.jvmVersions = JVM çæ¬
car.viewForDownload.license = 许å¯è¯
-car.viewForDownload.moduleId = 模åID
+car.viewForDownload.moduleId = 模å ID
car.viewForDownload.obsoletes = åºå¼
car.viewForDownload.prerequisites = å
å³æ¡ä»¶
car.viewForDownload.website = ç«ç¹
@@ -148,13 +148,13 @@
configmanager.deploy.showDetail = æ¾ç¤ºå®æ´ä¿¡æ¯
configmanager.deploy.showMigratedPlan = æ¾ç¤ºè¿ç§»åç计å
configmanager.deploy.showOriginalPlan = æ¾ç¤ºåå§é¨ç½²è®¡å
-configmanager.deployHelp.archiveExp = æµè§ç³»ç»æ¥éæ©warå
ã
-configmanager.deployHelp.installApplication = å®è£
åºç¨å°Geronimoæå¡å¨ã
-configmanager.deployHelp.planExp = å¦æé¨ç½²è®¡å没æ被æå
å¨warå
ä¸ï¼é£ä¹ç¹å»"æµè§"æé®æ¥éæ©é¨ç½²è®¡åã
+configmanager.deployHelp.archiveExp = æµè§ç³»ç»æ¥éæ© WAR å
ã
+configmanager.deployHelp.installApplication = å®è£
åºç¨å° Geronimo æå¡å¨ã
+configmanager.deployHelp.planExp = å¦æé¨ç½²è®¡å没æ被æå
å¨ WAR å
ä¸ï¼é£ä¹ç¹å»"æµè§"æé®æ¥éæ©é¨ç½²è®¡åã
configmanager.deployHelp.startAppAfterInstallExp = éä¸è¿ä¸ªå¤éæ¡ï¼ä¼å¨åºç¨å®è£
åèªå¨å¯å¨å®ãå¦åï¼ç¨æ·éè¦å¨"å·²å®è£
åºç¨"çªå£ä¸ç¹å»ç¸åºç"å¯å¨"é¾æ¥æ¥å¯å¨åºç¨ãé»è®¤æ
åµä¸ï¼è¿ä¸ªå¤éæ¡è¢«éä¸ï¼ä¼èªå¨å°å¯å¨æ°å®è£
çåºç¨ã
-configmanager.deployHelp.title = è¿ä¸ª portlet å
许ç¨æ·é¨ç½²æ°åºç¨å° Geronimo ä¸ãWeb åºç¨éè¦é¨ç½²è®¡åï¼é¨ç½²è®¡åå¯ä»¥è¢«æå
å¨ war å
ä¸ï¼æè
ä¿åå¨ä¸ä¸ªç¬ç«çé常åå为geronimo-web.xmlçæ件ä¸ã
+configmanager.deployHelp.title = è¿ä¸ª portlet å
许ç¨æ·é¨ç½²æ°åºç¨å° Geronimo ä¸ãWeb åºç¨éè¦é¨ç½²è®¡åï¼é¨ç½²è®¡åå¯ä»¥è¢«æå
å¨ WAR å
ä¸ï¼æè
ä¿åå¨ä¸ä¸ªç¬ç«çé常åå为 geronimo-web.xml çæ件ä¸ã
-consolebase.common.JVMVersions = JVMçæ¬
+consolebase.common.JVMVersions = JVM çæ¬
consolebase.common.actions = æä½
consolebase.common.cancel = åæ¶
consolebase.common.commands = å½ä»¤
@@ -181,14 +181,14 @@
consolebase.common.user = ç¨æ·
consolebase.common.userName = ç¨æ·å
-realmwizard._sql.JDBCDriverClassExp = JDBC 驱å¨ç±»çå®å
¨éå®åãè¦æ±é©±å¨ç±»å¿
é¡»è½å¨ä¸ä¸ä¸ªå段æå®çJARå
ä¸æ¾å°ã
+realmwizard._sql.JDBCDriverClassExp = JDBC 驱å¨ç±»çå®å
¨éå®åãè¦æ±é©±å¨ç±»å¿
é¡»è½å¨ä¸ä¸ä¸ªå段æå®ç JAR å
ä¸æ¾å°ã
realmwizard._sql.JDBCPasswordExp = è¿æ¥æ°æ®åºçå¯ç
realmwizard._sql.JDBCUrlExp = JDBC URL æå®äºè¦è¿æ¥æ°æ®åºæ¶çç»èã对äºä¸åç JDBC 驱å¨ï¼æ ¼å¼å°ææä¸åã
realmwizard._sql.JDBCUsernameExp = è¿æ¥æ°æ®åºçç¨æ·å
realmwizard._sql.databasePoolExp = ç»å½æ¨¡åç¨æ¥è¿æ¥æ°æ®åºçæ°æ®åºè¿æ¥æ± ãå¦ææå®äºæ°æ®åºè¿æ¥æ± çè¯ï¼ä¸é¢çå
¶å®è®¾ç½®é½ä¸æ¯å¿
é¡»çã
realmwizard._sql.digestAlgorithmExp = 对äºæ¤å£ä»¤è¦ä½¿ç¨çæ¶æ¯æè¦ç®æ³ (ä¾å¦ MD5, SHA1 ç). å¦æä¸ä½¿ç¨æ¶æ¯æè¦ç®æ³ï¼è¯·ä½¿æ¤å¼ä¸ºç©ºã
realmwizard._sql.digestEncodingExp = 对æè¦çç¼ç (ä¾å¦ hex, base64). ä»
å½æå®äºæ¶æ¯æè¦ç®æ³æ¶ä½¿ç¨ãå¦æä¸ç¥éç¼ç ç®æ³ï¼ä¼é»è®¤ä½¿ç¨hexç®æ³ã
-realmwizard._sql.driverJARExp = å
å«éå® JDBC 驱å¨ç JAR å
ãå¿
é¡»å®è£
å°GERONIMO/repository/ç®å½åæä¼å¨å表ä¸æ¾ç¤ºã
+realmwizard._sql.driverJARExp = å
å«éå® JDBC 驱å¨ç JAR å
ãå¿
é¡»å®è£
å° GERONIMO/repository/ ç®å½åæä¼å¨å表ä¸æ¾ç¤ºã
realmwizard._sql.eitherPoolOrJDBC = SQL å®å
¨åå¿
é¡»éè¿æ°æ®åºè¿æ¥æ± æè
JDBC è¿æ¥æ¥è¿å°æ°æ®åºã请éæ©æ¯ä½¿ç¨æ°æ®åºè¿æ¥æ± ï¼è¿æ¯ä½¿ç¨JDBCã
realmwizard._sql.groupSelectSQLExp = ç¨æ¥è·å¾ç¨æ·æå±ç»çä¿¡æ¯ãè¿ä¸ªè¯å¥åºè¯¥è¿å两åå¼ï¼ç¬¬ä¸åæ¯ç¨æ·åï¼ç¬¬äºåæ¯ç»åãè¿ä¸ªè¯å¥å¯ä»¥ä½¿ç¨ PreparedStatement è¯æ³ï¼ç¨?æ¥è¡¨ç¤ºåæ°ãä¸ä¸ªå
¸åçè®¾ç½®æ¯ <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt>æè
ï¼ä¸ºäºè·å¾æ´å è§èç模å¼ï¼å¯ç¨<tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt>ã
realmwizard._sql.selectDatabasePool = SQL å®å
¨åå¿
é¡»éè¿æ°æ®åºè¿æ¥æ± æè
JDBC è¿æ¥æ¥è¿å°æ°æ®åºã请éæ©æ¯ä½¿ç¨æ°æ®åºè¿æ¥æ± ï¼è¿æ¯ä½¿ç¨JDBCã
@@ -205,12 +205,12 @@
realmwizard.advanced.namedCredential = Named Credential
realmwizard.advanced.storePasswordEnabledExp = å¦æå¯ç¨ï¼æ¯ä¸ªç¨æ·çå¯ç ä¼ä¿åå¨Subjectçç§æcredentialä¸ãè¿å°å
许å¨ç»å½å®æ以åï¼å¯ä»¥å¾å°å¯ç ã è¿é常ä¸æ¯å¿
é¡»çã
realmwizard.advanced.title = <b>å建å®å
¨å</b> -- æ¥éª¤3:é«çº§é
ç½®é项
-realmwizard.common.JDBCDriverClass = JDBC驱å¨ç±»
-realmwizard.common.JDBCPassword = JDBCå¯ç
+realmwizard.common.JDBCDriverClass = JDBC 驱å¨ç±»
+realmwizard.common.JDBCPassword = JDBC å¯ç
realmwizard.common.JDBCUrl = JDBC URL
-realmwizard.common.JDBCUsername = JDBCç¨æ·å
+realmwizard.common.JDBCUsername = JDBC ç¨æ·å
realmwizard.common.addSecurityRealm = æ·»å æ°çå®å
¨å
-realmwizard.common.addToEAR = æ·»å å°EARä¸
+realmwizard.common.addToEAR = æ·»å å° EAR ä¸
realmwizard.common.comfirmPwd = 确认å¯ç
realmwizard.common.configurationOptions = é
ç½®é项
realmwizard.common.controlFlag = æ§å¶æ å¿
@@ -221,7 +221,7 @@
realmwizard.common.deploymentPlan = é¨ç½²è®¡å
realmwizard.common.digestAlgorithm = æè¦ç®æ³
realmwizard.common.digestEncoding = æè¦ç¼ç
-realmwizard.common.driverJAR = 驱å¨JAR
+realmwizard.common.driverJAR = é©±å¨ JAR
realmwizard.common.editRealm = ç¼è¾å®å
¨å
realmwizard.common.editSettings = ç¼è¾è®¾ç½®
realmwizard.common.emptyText = ç¦ç¹æå¨å段ä¸è½ä¸ºç©ºã
@@ -248,76 +248,76 @@
realmwizard.common.testAgain = å次æµè¯
realmwizard.common.testLogin = æµè¯ç»å½
realmwizard.common.userSelectSQL = User SELECT SQL
-realmwizard.configure.certprops.groupsURI.description = å
å«ç»ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äºGeronimo家ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯ <tt>group=user,user,...</tt>ã
-realmwizard.configure.certprops.groupsURI.name = ç»æ件URI
-realmwizard.configure.certprops.usersURI.description = å
å«è¯ä¹¦å°ç¨æ·çæ å°ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äºGeronimo家ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯<tt>username=certificatename</tt>ï¼å
¶ä¸è¯ä¹¦å为<tt>X509Certificate.getSubjectX500Principal().getName()</tt>ã
-realmwizard.configure.certprops.usersURI.name = ç¨æ·æ件URI
+realmwizard.configure.certprops.groupsURI.description = å
å«ç»ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äº Geronimo å®è£
ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯ <tt>group=user,user,...</tt>ã
+realmwizard.configure.certprops.groupsURI.name = ç»æ件 URI
+realmwizard.configure.certprops.usersURI.description = å
å«è¯ä¹¦å°ç¨æ·çæ å°ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äº Geronimo å®è£
ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯<tt>username=certificatename</tt>ï¼å
¶ä¸è¯ä¹¦å为<tt>X509Certificate.getSubjectX500Principal().getName()</tt>ã
+realmwizard.configure.certprops.usersURI.name = ç¨æ·æ件 URI
realmwizard.configure.ldap.authentication.description = 使ç¨çå®å
¨çº§å«ï¼å¯ä»¥æ¯<tt>none</tt>, <tt>simple</tt>, æè
<tt>strong</tt>(é常çå¼æ¯<tt>simple</tt>ãå¦æä¸æå®è¿ä¸ªå±æ§ï¼è¡ä¸ºç±æå¡ä¾åºåå³å®ã
realmwizard.configure.ldap.authentication.name = éªè¯
-realmwizard.configure.ldap.connectionPassword.description = ç¨äºè¿æ¥LDAPæå¡å¨çå¯ç ã
+realmwizard.configure.ldap.connectionPassword.description = ç¨äºè¿æ¥ LDAP æå¡å¨çå¯ç ã
realmwizard.configure.ldap.connectionPassword.name = è¿æ¥å¯ç
-realmwizard.configure.ldap.connectionProtocol.description = ç¨äºä¸LDAPæå¡å¨è¿è¡éä¿¡çè¿æ¥åè®®ãé常ç空ï¼å°½ç®¡å¦ææå¡å¨æ¯æçè¯å¯ä»¥å°å®è®¾ä¸º<tt>ssl</tt>ã
+realmwizard.configure.ldap.connectionProtocol.description = ç¨äºä¸ LDAP æå¡å¨è¿è¡éä¿¡çè¿æ¥åè®®ãé常ç空ï¼å¦ææå¡å¨æ¯æçè¯å¯ä»¥å°å®è®¾ä¸º<tt>ssl</tt>ã
realmwizard.configure.ldap.connectionProtocol.name = è¿æ¥åè®®
-realmwizard.configure.ldap.connectionURL.description = æè¿°å¦ä½è¿æ¥å°LDAPæå¡å¨çURLãé常è¿ä¼æ¯<tt>ldap://ldap-server-hostname:389</tt>(æè
对äºå
å«å¨Geronimoä¸çApacheç®å½æå¡å¨ï¼åæ¯<tt>ldap://localhost:1389</tt>)ã
-realmwizard.configure.ldap.connectionURL.name = è¿æ¥URL
-realmwizard.configure.ldap.connectionUsername.description = ç¨äºè¿æ¥å°LDAPæå¡å¨çç¨æ·åãè¿åºè¯¥æ¯ä¸ä¸ªç®¡çåæè
ç®å½ç®¡çè
ï¼ä»æææ£æ¥å
¶ä»ç¨æ·çå¯ç ã
+realmwizard.configure.ldap.connectionURL.description = LDAP æå¡å¨ç URLãé常è¿ä¼æ¯<tt>ldap://ldap-server-hostname:389</tt>(æè
对äºå
å«å¨ Geronimo ä¸ç Apache ç®å½æå¡å¨ï¼ä¸º<tt>ldap://localhost:1389</tt>)ã
+realmwizard.configure.ldap.connectionURL.name = è¿æ¥ URL
+realmwizard.configure.ldap.connectionUsername.description = ç¨äºè¿æ¥å° LDAP æå¡å¨çç¨æ·åãè¿åºè¯¥æ¯ä¸ä¸ªç®¡çåæè
ç®å½ç®¡çè
ï¼ä»æææ£æ¥å
¶ä»ç¨æ·çå¯ç ã
realmwizard.configure.ldap.connectionUsername.name = è¿æ¥ç¨æ·å
-realmwizard.configure.ldap.initialContextFactory.description = åå§ä¸ä¸æå·¥åçå®æ´éå®ç±»åãå¦æä½ ä¸ç¥éè¿é该ç¨ä»ä¹ï¼è¯·ä½¿ç¨<tt>com.sun.jndi.ldap.LdapCtxFactory</tt>ã
+realmwizard.configure.ldap.initialContextFactory.description = åå§ä¸ä¸æå·¥åçå®æ´éå®ç±»åãå¦æä½ ç¡®å®åºè¯¥ç¨ä»ä¹å¼ï¼å¯ä»¥ä½¿ç¨<tt>com.sun.jndi.ldap.LdapCtxFactory</tt>ã
realmwizard.configure.ldap.initialContextFactory.name = åå§ä¸ä¸æå·¥å
-realmwizard.configure.ldap.roleBase.description = æç´¢è§è²çåºç¡LDAPä¸ä¸æ(ä½ç½®)ãæç´¢å¯è½åªæ¥æ¾è¯¥ä½ç½®ï¼æè
è¿å
æ©åä¸ä¸æï¼è¿å°åå³äºä¸é¢ç"è§è²æç´¢åæ "设å®ã
+realmwizard.configure.ldap.roleBase.description = æç´¢è§è²çåºç¡ LDAP ä¸ä¸æ(ä½ç½®)ãæç´¢å¯è½åªæ¥æ¾è¯¥ä½ç½®ï¼æè
è¿å
æ©åä¸ä¸æï¼è¿å°åå³äºä¸é¢ç"è§è²æç´¢åæ "设å®ã
realmwizard.configure.ldap.roleBase.name = è§è²åºç¡
-realmwizard.configure.ldap.roleName.description = 对åºè§è²å称çLDAPå±æ§ç±»åã常常设为<tt>cn</tt>ã
+realmwizard.configure.ldap.roleName.description = 对åºè§è²å称ç LDAP å±æ§ç±»åã常常设为<tt>cn</tt>ã
realmwizard.configure.ldap.roleName.name = è§è²å称
-realmwizard.configure.ldap.roleSearchMatching.description = è§è²ç¨äºæ¥æ¾å±äºè¯¥è§è²çç¨æ·çLDAPå±æ§æç´¢å符串ãå½è§è²æå¾å¤ç¸åå称ä½åå¼ä¸åçå±æ§æ¶(æ¯ä¸ªç¨æ·ä¸ä¸ª)使ç¨å®ãé常使ç¨åæ°<tt>{0}</tt>æ¥æ è¯ç¨æ·åãå
¸åå¼å¯è½ä¸º<tt>(member={0})</tt>æè
<tt>(memberUID={0})</tt>ã
+realmwizard.configure.ldap.roleSearchMatching.description = è§è²ç¨äºæ¥æ¾å±äºè¯¥è§è²çç¨æ·ç LDAP å±æ§æç´¢å符串ãå½è§è²æå¾å¤ç¸åå称ä½åå¼ä¸åçå±æ§æ¶(æ¯ä¸ªç¨æ·ä¸ä¸ª)使ç¨å®ãé常使ç¨åæ°<tt>{0}</tt>æ¥æ è¯ç¨æ·åãå
¸åå¼å¯è½ä¸º<tt>(member={0})</tt>æè
<tt>(memberUID={0})</tt>ã
realmwizard.configure.ldap.roleSearchMatching.name = è§è²ç¨æ·æç´¢å符串
realmwizard.configure.ldap.roleSearchSubtree.description = å¦æ设为<tt>true</tt>ï¼å"è§è²åºç¡"ä¸é¢çåæ ä¹å°è¢«æ索以æ¥æ¾è§è²ãå¦æ设为<tt>false</tt>ï¼ååªæ"è§è²åºç¡"ä½ç½®æ¬èº«ä¼è¢«æç´¢ã
realmwizard.configure.ldap.roleSearchSubtree.name = è§è²æç´¢åæ
-realmwizard.configure.ldap.userBase.description = æç´¢ç¨æ·çåºç¡LDAPä¸ä¸æ(ä½ç½®)ãæç´¢å¯è½åªæ¥æ¾è¯¥ä½ç½®ï¼æè
è¿å
æ©åä¸ä¸æï¼è¿å°åå³äºä¸é¢ç"ç¨æ·æç´¢åæ "设å®ã
+realmwizard.configure.ldap.userBase.description = æç´¢ç¨æ·çåºç¡ LDAP ä¸ä¸æ(ä½ç½®)ãæç´¢å¯è½åªæ¥æ¾è¯¥ä½ç½®ï¼æè
è¿å
æ©åä¸ä¸æï¼è¿å°åå³äºä¸é¢ç"ç¨æ·æç´¢åæ "设å®ã
realmwizard.configure.ldap.userBase.name = ç¨æ·åºç¡
realmwizard.configure.ldap.userRoleName.description = å¦æè§è²æ¡ç®æ²¡æé对ç¨æ·çå±æ§ï¼èç¨æ·æ¡ç®æä¸ä¸ªé对è§è²çå±æ§ï¼ååºè¯¥ä½¿ç¨å®èä¸æ¯"è§è²ç¨æ·æç´¢å符串"ãå®å½åäºç¨æ·ä¸çå±æ§ï¼è¯¥å±æ§ååºäºä¸ä¸ªè§è²ï¼è¿ä¸ªè§è²å
å«äºè¯¥ç¨æ·ãå
¸åå¼å¯è½æ¯<tt>(memberOf={0})</tt>ã
realmwizard.configure.ldap.userRoleName.name = ç¨æ·è§è²æç´¢å符串
-realmwizard.configure.ldap.userSearchMatching.description = æ¯ç¨äºæ¥æ¾ç¨æ·çLDAPå±æ§æç´¢å符串ãå
许RFC 2254è¿æ»¤å¨ï¼ä¸é常使ç¨åæ°<tt>{0}</tt>æ¥æ è¯ç¨æ·åãå
¸åå¼å¯è½ä¸º<tt>(uid={0})</tt>æè
<tt>(cn={0})</tt>ã
+realmwizard.configure.ldap.userSearchMatching.description = æ¯ç¨äºæ¥æ¾ç¨æ·ç LDAP å±æ§æç´¢å符串ãå
许 RFC-2254 è¿æ»¤å¨ï¼ä¸é常使ç¨åæ°<tt>{0}</tt>æ¥æ è¯ç¨æ·åãå
¸åå¼å¯è½ä¸º<tt>(uid={0})</tt>æè
<tt>(cn={0})</tt>ã
realmwizard.configure.ldap.userSearchMatching.name = ç¨æ·æç´¢å¹é
realmwizard.configure.ldap.userSearchSubtree.description = å¦æ设为<tt>true</tt>ï¼å"ç¨æ·åºç¡"ä¸é¢çåæ ä¹å°è¢«æ索以æ¥æ¾ç¨æ·ãå¦æ设为<tt>false</tt>ï¼ååªæ"ç¨æ·åºç¡"ä½ç½®æ¬èº«ä¼è¢«æç´¢ã
realmwizard.configure.ldap.userSearchSubtree.name = ç¨æ·æç´¢åæ
-realmwizard.configure.props.digest.description = ç¨å¨å¯ç ä¸çæ¶æ¯æè¦ç®æ³(ä¾å¦ï¼MD5, SHA1çç)ãå¦æä¸ä½¿ç¨æè¦ç®æ³åå°è¯¥å段ç空ã
+realmwizard.configure.props.digest.description = ç¨å¨å¯ç ä¸çæ¶æ¯æè¦ç®æ³(ä¾å¦ï¼MD5, SHA1 ç)ãå¦æä¸ä½¿ç¨æè¦ç®æ³åå°è¯¥å段ç空ã
realmwizard.configure.props.digest.name = æè¦ç®æ³
realmwizard.configure.props.encoding.description = æè¦ä½¿ç¨çç¼ç (ä¾å¦ï¼hex, base64)ãåªææå®äºæ¶æ¯æè¦ç®æ³æ使ç¨å®ãå¦æ没ææå®ç¼ç ï¼å使ç¨hexã
realmwizard.configure.props.encoding.name = æè¦ç¼ç
-realmwizard.configure.props.groupsURI.description = å
å«ç»ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äºGeronimo家ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯ <tt>group=user,user,...</tt>ã
-realmwizard.configure.props.groupsURI.name = ç»æ件URI
-realmwizard.configure.props.usersURI.description = å
å«ç¨æ·/å¯ç ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äºGeronimo家ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯<tt>username=password</tt>ã
-realmwizard.configure.props.usersURI.name = ç¨æ·æ件URI
-realmwizard.configure.title = <b>å建å®å
¨å</b> --æ¥éª¤ 2:é
ç½®ç»å½æ¨¡å
+realmwizard.configure.props.groupsURI.description = å
å«ç»ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äº Geronimo å®è£
ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯ <tt>group=user,user,...</tt>ã
+realmwizard.configure.props.groupsURI.name = ç»æ件 URI
+realmwizard.configure.props.usersURI.description = å
å«ç¨æ·/å¯ç ä¿¡æ¯çå±æ§æ件çä½ç½®(ç¸å¯¹äº Geronimo å®è£
ç®å½)ãæ¯ä¸è¡çæ ¼å¼åºè¯¥æ¯<tt>username=password</tt>ã
+realmwizard.configure.props.usersURI.name = ç¨æ·æ件 URI
+realmwizard.configure.title = <b>å建å®å
¨å</b> --æ¥éª¤ 2 :é
ç½®ç»å½æ¨¡å
realmwizard.edit.configurationOptionsExp = ç»å½æ¨¡åå¿
é¡»çä»»ä½é
ç½®é项ï¼ä»¥æ åçJavaå±æ§æä»¶æ ¼å¼ï¼ä¸è¡ä¸ä¸ªï¼å¦ï¼<tt>name=value</tt>ï¼
realmwizard.edit.controlFlagExp = ç»å½æ¨¡åçæ§å¶æ å¿ï¼ç¨æ¥æ§å¶å½ç»å½æ¨¡åæåæ失败æ¶ï¼æ»çç»å½è¿ç¨ä¼ææ ·ãæ´è¯¦ç»çä¿¡æ¯ï¼è¯·ç
realmwizard.edit.ifLeaveBlank = å¦æä½ ä¸éè¦ä½¿ç¨ä¸åææçç»å½æ¨¡åï¼åªéè¦æé¢å¤ç模åç空å³å¯ã
-realmwizard.edit.loginDomainExp = è¿ä¸ªç»å½æ¨¡å对åºçç»å½åï¼æ¨¡åå称å¨å®å
¨åçææ模åä¸å¿
é¡»æ¯å¯ä¸çãè¿æ ·å°±å¯ä»¥éè¿ä¸»ä½(principal) æ¥åºå两个ç¸åçç»å½æ¨¡åãï¼ä¾å¦ï¼ä»ä¸¤ä¸ªLDAPç»å½æ¨¡åæå两个ä¸åçLDAPæå¡å¨ï¼
+realmwizard.edit.loginDomainExp = è¿ä¸ªç»å½æ¨¡å对åºçç»å½åï¼æ¨¡åå称å¨å®å
¨åçææ模åä¸å¿
é¡»æ¯å¯ä¸çãè¿æ ·å°±å¯ä»¥éè¿ä¸»ä½(principal) æ¥åºå两个ç¸åçç»å½æ¨¡åãï¼ä¾å¦ï¼ä»ä¸¤ä¸ªLDAPç»å½æ¨¡åæå两个ä¸åç LDAP æå¡å¨ï¼
realmwizard.edit.loginModuleClassExp = ç»å½æ¨¡åçå®å
¨éå®ç±»åã
-realmwizard.edit.loginModuleJAR = ç»å½æ¨¡åJAR
-realmwizard.edit.loginModuleJARExp = æ¤jaræ件ä¸å
å«ç»å½æ¨¡åç±»å主ä½ç±».
+realmwizard.edit.loginModuleJAR = ç»å½æ¨¡å JAR
+realmwizard.edit.loginModuleJARExp = æ¤ JAR æ件ä¸å
å«ç»å½æ¨¡åç±»å主ä½ç±».
realmwizard.edit.realmNameExp = åä¸ä¸ªä¸åäºæå¡å¨ä¸ä»»ä½å
¶ä»å®å
¨åçå称ãå称ä¸è¯·ä¸è¦æç©ºæ ¼ãå
¶ä»ç»ä»¶å°ä½¿ç¨è¿ä¸ªå称æ¥æåæ¤å®å
¨åã
-realmwizard.edit.serverSideExp = å¨åºç¨æå¡å¨ä¸æ§è¡Server-sideçç»å½æ¨¡åï¼è¿é常æ¯æ£ç¡®çï¼ãå¨å®¢æ·ç«¯ç¯å¢æ§è¡çæ¯Client-sideçç»å½æ¨¡åï¼ä¸¾ä¾æ¥è¯´ï¼ä¸ºäºä½¿ç¨å®¢æ·æä½ç³»ç»ç³»ç»çåç¹ç»å½ç¹æ§ã
+realmwizard.edit.serverSideExp = å¨åºç¨æå¡å¨ä¸æ§è¡Server-sideçç»å½æ¨¡åï¼è¿é常æ¯æ£ç¡®çï¼ãå¨å®¢æ·ç«¯ç¯å¢æ§è¡çæ¯ Client-side çç»å½æ¨¡åï¼ä¸¾ä¾æ¥è¯´ï¼ä¸ºäºä½¿ç¨å®¢æ·æä½ç³»ç»ç³»ç»çåç¹ç»å½ç¹æ§ã
realmwizard.edit.summary = <p>è¿ä¸ªé¡µé¢ç¨æ¥ç¼è¾æ°çæå·²åå¨çå®å
¨åã</p><p>ä¸ä¸ªå®å
¨åå¯è½å
å«ä¸ä¸ªæå¤ä¸ªç»å½æ¨¡åãå¾å¤ç®åçå®å
¨åä»
ä»
å
å«ä¸ä¸ªç»å½æ¨¡åãå¯ä»¥ä½¿ç¨é¢å¤çç»å½æ¨¡åæ¥è®¿é®æ´å¤çå®å
¨ç¸å
³ä¿¡æ¯ãæè
æ·»å 类似äºå®¡æ ¸å®å
¨åèä¸å½±åå®å
¨åéªè¯æµç¨çåè½ã
-realmwizard.edit.supportAdvancedMappingExp = é常ï¼Geronimoä¸è½åºå«æåæ ·å称ç两个ä¸åç主ä½ï¼ä»¥å两个ä¸åç»å½æ¨¡å产ççåæ ·ç主ä½ç±»ãå¦æå¯ç¨åè¿ä¸ªé项ï¼Geronimo ä¼å
è£
主ä½å¹¶è·è¸ªæ¯ä¸ªä¸»ä½æ¥èªåªä¸ªå®å
¨ååç»å½æ¨¡åãè¿è®©ä½ å¯ä»¥å¨Geronimo é¨ç½²è®¡åçå®å
¨æ å°ä¸ä½¿ç¨ realm-principal å login-domain-principal å
ç´ ã
+realmwizard.edit.supportAdvancedMappingExp = é常ï¼Geronimo ä¸è½åºå«æåæ ·å称ç两个ä¸åç主ä½ï¼ä»¥å两个ä¸åç»å½æ¨¡å产ççåæ ·ç主ä½ç±»ãå¦æå¯ç¨åè¿ä¸ªé项ï¼Geronimo ä¼å
è£
主ä½å¹¶è·è¸ªæ¯ä¸ªä¸»ä½æ¥èªåªä¸ªå®å
¨ååç»å½æ¨¡åãè¿è®©ä½ å¯ä»¥å¨Geronimo é¨ç½²è®¡åçå®å
¨æ å°ä¸ä½¿ç¨ realm-principal å login-domain-principal å
ç´ ã
realmwizard.list.noSecurityRealms = ä¸åå¨é¢å®ä¹çå®å
¨å
realmwizard.list.seeExamples = 对äºååºçæ¯ä¸ä¸ªåï¼å¯ä»¥ç¹å»<b>ç¨æ³</b>æ¥æ¥çå¦ä½å¨ä½ çåºç¨ä¸ä½¿ç¨è¯¥åçä¾åã
realmwizard.list.title = è¿ä¸ªé¡µé¢æ¾ç¤ºäºææå¯ç¨çå®å
¨åãå¯ä»¥ç¼è¾æå¡å¨çº§å«çå®å
¨åï¼ä½ä¸ºå个åºç¨ä¸é¨å被é¨ç½²çå®å
¨ååä¸è½è¢«ç¼è¾ï¼èåºä¿®æ¹åºç¨é¨ç½²è®¡åï¼ã
realmwizard.selectType.nameOfSecurityRealmExp = ç»å®å
¨åéåä¸ä¸ªä¸åäºæå¡å¨ä¸å
¶å®å®å
¨åçå称ï¼å称ä¸è¯·ä¸è¦æç©ºæ ¼ãå
¶å®ç»ä»¶å°ä½¿ç¨è¿ä¸ªå称æ¥æå该å®å
¨åã
-realmwizard.selectType.realmTypeExp = ç»å½æ¨¡åçç±»åå³å®äºå®å
¨åç±»åãéæ©"Other"ï¼å¯ä»¥æå¨é
ç½®ä¸äºé项ï¼å
æ¬ï¼èªå®ä¹ç»å½æ¨¡åã使ç¨å¤ä¸ªç»å½æ¨¡åæ¥å¡«å
ç¨æ·èº«ä¸»ä½çå®å
¨åã
-realmwizard.selectType.title = <b>å建å®å
¨å</b> --æ¥éª¤1: éæ©å称åç±»å
+realmwizard.selectType.realmTypeExp = ç»å½æ¨¡åçç±»åå³å®äºå®å
¨åç±»åãéæ© âå
¶ä»"å¯ä»¥æå¨é
ç½®ä¸äºé项ï¼å¦èªå®ä¹ç»å½æ¨¡åã使ç¨å¤ä¸ªç»å½æ¨¡åæ¥å¡«å
ç¨æ·èº«ä¸»ä½çå®å
¨åã
+realmwizard.selectType.title = <b>å建å®å
¨å</b> --æ¥éª¤ 1: éæ©å称åç±»å
realmwizard.showPlan.addToEARExp = ä½ å¯ä»¥å°å®å
¨åé¨ç½²ä¸ºEARçä¸é¨åï¼èä¸æ¯é¨ç½²ä¸ºé¡¶å±çå®å
¨åãè¦ä½¿ç¨è¿ä¸ªé¨ç½²è®¡åå°å®å
¨åæ·»å å°EARä¸ï¼å¨ä½ çEARä¸å建<tt>META-INF/geronimo-application.xml</tt>æ件ï¼å
¶ä¸å
å«ä¸é¢é¨ç½²è®¡åä¸ç<tt>dependency</tt>å
ç´ å<tt>gbean</tt>å
ç´ ãå®åºè¯¥è±¡ä¸é¢è¿æ ·ï¼
realmwizard.showPlan.deployCommandExp = å¦æå¨å½ä»¤è¡ä¸ä½¿ç¨è¿ä¸ªé¨ç½²è®¡åæ¥é¨ç½²å®å
¨åï¼å°å®æ·è´ç²å¸å°ä¸ä¸ªæ件ï¼å¦<tt>security-realm.xml</tt>ï¼ä¸å¹¶ä¿åãç¶åè¿è¡ä¸é¢çå½ä»¤ï¼
realmwizard.showPlan.title = <b>å建å®å
¨å</b> -- æ¾ç¤ºé¨ç½²è®¡å
realmwizard.testLogin.passwordExp = ç¨æ¥ç»å½å°å®å
¨åçå¯ç ã
realmwizard.testLogin.summary = å¨è¿éä½ å¯ä»¥ä¸ºå®å
¨åç主ç»å½æ¨¡åè¾å
¥ç¨æ·ååå¯ç ï¼æ£æ¥ç»å½æ¯å¦æåï¼æ¥ç为ç¨æ·çæäºåªäºä¸»ä½ãè¿å¯ä»¥æ示主ç»å½æ¨¡åç设置æ¯å¦æ£ç¡®ãå®ä¸ä¼è°ç¨è±¡å®¡æ ¸ï¼éå®å¸å·çé«çº§åè½ã
-realmwizard.testLogin.title = <b>å建å®å
¨å</b> --æ¥éª¤4ï¼æµè¯ç»å½
+realmwizard.testLogin.title = <b>å建å®å
¨å</b> --æ¥éª¤ 4ï¼æµè¯ç»å½
realmwizard.testLogin.usernameExp = ç¨æ¥ç»å½å°å®å
¨åçç¨æ·åã
realmwizard.testResults.testResults = æµè¯ç»æ
-realmwizard.testResults.title = <b>å建å®å
¨å</b> -- æ¥éª¤5: ç»å½ç»æ
+realmwizard.testResults.title = <b>å建å®å
¨å</b> -- æ¥éª¤ 5: ç»å½ç»æ
realmwizard.usage.applicationCode = åºç¨ç¨åºä»£ç
-realmwizard.usage.applicationCodeExp = <p>使ç¨å®å
¨è§è²ï¼å¹¶ä¸éè¦ç¹æ®çåºç¨ç¨åºä»£ç ã</p><p>å¦æåºç¨ç¨åºä¸è°ç¨<tt>HttpServletRequest.getUserPrincipal()</tt>ï¼Geronimoä¼è¿åä¸ä¸ªå®ç°<tt>GeronimoCallerPrincipal</tt>æ¥å£çprincipalç±»çå®ä¾ã--é常æ¯ç¨æ·åï¼å 为<tt>GeronimoUserPrincipal</tt>å®ç°äº<tt>GeronimoCallerPrincipal</tt>æ¥å£ï¼ãå¦æä½ æ£å¨ä½¿ç¨èªå®ä¹çç»å½æ¨¡åï¼èè°ç¨<tt>getUserPrincipal</tt>æ¶å¾å°äºé误çç»æãå°è¯å°ä½ çuser principalç±»å®ç°<tt>GeronimoCallerPrincipal</tt>æ¥å£ã</p> <p>å¦æåºç¨è°ç¨<tt>HttpServletRequest.isUserI
nRole(role)</tt>ï¼Geronimoå°ä¼æ ¹æ®å®å
¨åç»å½æ¨¡ååé
ç»è¯¥ç¨æ·çprincipalæ¯å¦ååºå¨ä¸é¢çè§è²æ å°ä¸æ¥å³å®è¿åtrueè¿æ¯falseã</p>
-realmwizard.usage.geronimoWebXmlLater = <p>è¿ä¸ªä¾å表æï¼{0} å°è¢«ç¨æ¥å¤ç Web åºç¨çææç»å½ã æ¥çå®ä½¿ç¨ä¸»ä½ç±»å主ä½å称çèåæ¥æ <tt>admin</tt> è§è²æ å°å°ç¨æ· <tt>root</tt> ï¼åç» <tt>administrators</tt> ã注æå¦æ{0} 使ç¨èªå®ä¹çç»å½æ¨¡åï¼ä¸»ä½ç±»å¯è½ä¼ææä¸åã ä½æ¯ä¸é¢ååºçæ¯è¢«ææçæ åçGeronimoç»å½æ¨¡å使ç¨çç¨æ·åç»ã</p> <p>ä¹å¯ä»¥é
ç½®åç¬çç»å½æ¨¡åååç¬çç»å½åå称ï¼ç¶åå¨è§è²æ å°ä¸ä½¿ç¨ç»å½åå
§°ï¼è¿æ ·ï¼å¨ç»å½å Fooä¸ç root ç¨æ·ï¼åå¨ç»å½åBar ä¸çroot ç¨æ·æ¯ä¸ä¸æ ·çï¼ï¼ä½è¿ä»
ä»
å¨ä½ æå¤ä¸ªç»å½æ¨¡åæ¥ç»ç¨æ·åé
主ä½æ¶æéè¦ã</p> <p>æåï¼å¦æ<tt>security</tt>åæ¯å¨ EAR ç<tt>application.xml</tt> é¨ç½²æ述符ä¸å£°æçï¼é£ä¹å°±æ²¡æå¿
è¦å¨EAR ä¸çä»»ä½æ¨¡åä¸éå¤å®ã-- å®ä»¬ä¼å
±äº«ç¸åçè§è²æ å°ä¿¡æ¯ã</p>
-realmwizard.usage.geronimoWebXmlPreface = <p>为äºé
ç½®å®å
¨ååæ¯ä¸ªè§è²çæåï¼Webåºç¨éè¦æä¸ä¸ª<tt>geronimo-web.xml</tt>é¨ç½²è®¡åãå®å¯ä»¥æå
å¨WARå
ç<tt>WEB-INF</tt>ç®å½ä¸ï¼æè
å®ä¹å¯ä»¥å¨é¨ç½²å·¥å
·çå½ä»¤è¡ä¸åç¬å°æä¾ã</p><p><tt>geronimo-web.xml</tt>é¨ç½²è®¡ååºè¯¥æä¸ä¸ª<tt>security-realm-name</tt>å
ç´ ï¼ç¨æ¥æ æå¨Webåºç¨ä¸ç¨ä»ä¹å®å
¨åæ¥éªè¯ç»å½ãå®åæ ·æä¸ä¸ª <tt>security</tt>å
ç´ ï¼ç¨æ¥ååºç¨æ·åç»ï¼è¿äºç¨æ·åç»åºè¯¥æ¯ <tt>web.xml</tt>ä¸ç<tt>security-role</tt>æ æç
è§è²çæåã
+realmwizard.usage.applicationCodeExp = <p>使ç¨å®å
¨è§è²ï¼å¹¶ä¸éè¦ç¹æ®çåºç¨ç¨åºä»£ç ã</p><p>å¦æåºç¨ç¨åºä¸è°ç¨<tt>HttpServletRequest.getUserPrincipal()</tt>ï¼Geronimoä¼è¿åä¸ä¸ªå®ç°<tt>GeronimoCallerPrincipal</tt>æ¥å£ç principal ç±»çå®ä¾ã--é常æ¯ç¨æ·åï¼å 为<tt>GeronimoUserPrincipal</tt>å®ç°äº<tt>GeronimoCallerPrincipal</tt>æ¥å£ï¼ãå¦æä½ æ£å¨ä½¿ç¨èªå®ä¹çç»å½æ¨¡åï¼èè°ç¨<tt>getUserPrincipal</tt>æ¶å¾å°äºé误çç»æãå°è¯å°ä½ ç user principal ç±»å®ç°<tt>GeronimoCallerPrincipal</tt>æ¥å£ã</p> <p>å¦æåºç¨è°ç¨<tt>HttpServletRequest.isU
serInRole(role)</tt>ï¼Geronimoå°ä¼æ ¹æ®å®å
¨åç»å½æ¨¡ååé
ç»è¯¥ç¨æ·çprincipalæ¯å¦ååºå¨ä¸é¢çè§è²æ å°ä¸æ¥å³å®è¿å true è¿æ¯ falseã</p>
+realmwizard.usage.geronimoWebXmlLater = <p>è¿ä¸ªä¾å表æï¼{0} å°è¢«ç¨æ¥å¤ç Web åºç¨çææç»å½ã æ¥çå®ä½¿ç¨ä¸»ä½ç±»å主ä½å称çèåæ¥æ <tt>admin</tt> è§è²æ å°å°ç¨æ· <tt>root</tt> ï¼åç» <tt>administrators</tt> ã注æå¦æ{0} 使ç¨èªå®ä¹çç»å½æ¨¡åï¼ä¸»ä½ç±»å¯è½ä¼ææä¸åã ä½æ¯ä¸é¢ååºçæ¯è¢«ææçæ åçGeronimoç»å½æ¨¡å使ç¨çç¨æ·åç»ã</p> <p>ä¹å¯ä»¥é
ç½®åç¬çç»å½æ¨¡åååç¬çç»å½åå称ï¼ç¶åå¨è§è²æ å°ä¸ä½¿ç¨ç»å½åå
§°ï¼è¿æ ·ï¼å¨ç»å½å Foo ä¸ç root ç¨æ·ï¼åå¨ç»å½å Bar ä¸ç root ç¨æ·æ¯ä¸ä¸æ ·çï¼ï¼ä½è¿ä»
ä»
å¨ä½ æå¤ä¸ªç»å½æ¨¡åæ¥ç»ç¨æ·åé
主ä½æ¶æéè¦ã</p> <p>æåï¼å¦æ<tt>security</tt>åæ¯å¨ EAR ç<tt>application.xml</tt> é¨ç½²æ述符ä¸å£°æçï¼é£ä¹å°±æ²¡æå¿
è¦å¨ EAR ä¸çä»»ä½æ¨¡åä¸éå¤å®ã-- å®ä»¬ä¼å
±äº«ç¸åçè§è²æ å°ä¿¡æ¯ã</p>
+realmwizard.usage.geronimoWebXmlPreface = <p>为äºé
ç½®å®å
¨ååæ¯ä¸ªè§è²çæåï¼Web åºç¨éè¦æä¸ä¸ª<tt>geronimo-web.xml</tt>é¨ç½²è®¡åãå®å¯ä»¥æå
å¨ WAR å
ç<tt>WEB-INF</tt>ç®å½ä¸ï¼æè
å®ä¹å¯ä»¥å¨é¨ç½²å·¥å
·çå½ä»¤è¡ä¸åç¬å°æä¾ã</p><p><tt>geronimo-web.xml</tt>é¨ç½²è®¡ååºè¯¥æä¸ä¸ª<tt>security-realm-name</tt>å
ç´ ï¼ç¨æ¥æ æå¨ Web åºç¨ä¸ç¨ä»ä¹å®å
¨åæ¥éªè¯ç»å½ãå®åæ ·æä¸ä¸ª <tt>security</tt>å
ç´ ï¼ç¨æ¥ååºç¨æ·åç»ï¼è¿äºç¨æ·åç»åºè¯¥æ¯ <tt>web.xml</tt>ä¸ç<tt>security-role</tt>æ æ
è§è²çæåã
realmwizard.usage.title = è¿ä¸ªé¡µé¢ä»ç»ææ ·å¨ J2EE åºç¨ä¸ä½¿ç¨å®å
¨å{0} ãè¿éæ¯ä»¥ Web åºç¨ä¸ºä¾ï¼å¯¹äºå
¶ä»ç¨åºæ¨¡åï¼ä¹å¯ä½¿ç¨ç±»ä¼¼çæ¹æ³ã
realmwizard.usage.webXmlShouldHave = <p>å¨ <tt>web.xml</tt> ä¸åºè¯¥å«æ</p><ul> <li>ä¸ä¸ªæå¤ä¸ª <tt>security-constraint</tt> åï¼ç¨æ¥ææåä¿æ¤ç页é¢å URL </li> <li>ä¸ä¸ª<tt>login-config</tt> åï¼ç¨æ¥é
ç½®åºç¨çç»å½ä¿¡æ¯</li> <li>ä¸ä¸ªæå¤ä¸ª<tt>security-role</tt> åï¼ç¨æ¥ååºåºç¨ä¸ä½¿ç¨å°çå®å
¨è§è²</li></ul>
Modified: geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:10:25 2009
@@ -29,10 +29,10 @@
Security\ Realms = Security Realms
-plugin.errorMsg01 = Deployment Failed
-plugin.errorMsg02 = The application was not successfully started
-plugin.errorMsg03 = Security realm with the same name already exists, please specify a new security realm name.
-plugin.errorMsg04 = Unable to identify modules to replace. Please check if it has already been stopped or undeployed.
+plugin.errorMsg01 = The application was not deployed.
+plugin.errorMsg02 = The application was not successfully started.
+plugin.errorMsg03 = The security realm name already exists. Specify another name for the security realm.
+plugin.errorMsg04 = Unable to identify modules to replace. Check if it has already been stopped or undeployed.
plugin.infoMsg01 = The application was successfully deployed.
plugin.infoMsg02 = The application was successfully redeployed.
plugin.infoMsg03 = The application was successfully started.
Modified: geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties Mon Dec 7 08:10:25 2009
@@ -33,7 +33,7 @@
plugin.errorMsg01 = é¨ç½²å¤±è´¥
plugin.errorMsg02 = æªæåå¯å¨åºç¨
plugin.errorMsg03 = ååå®å
¨åå·²ç»åå¨ï¼è¯·æå®æ°çå®å
¨åå称ã
-plugin.errorMsg04 = \u00d3\u00a6\u00d3\u00c3·\u00fe\u00ce\u00f1\u00c6÷\u00d6\u00d0\u00b2\u00bb\u00b4\u00e6\u00d4\u00da\u00c4ú\u00cbù\u00d2\u00aa\u00c7ó\u00d6\u00d8\u00d0\u00c2\u00b2\u00bf\u00ca\u00f0\u00b5\u00c4\u00c4\u00a3\u00bfé\u00a1\u00a3\u00c7\u00eb\u00bcì\u00b2é\u00ca\u00c7·\u00f1\u00cbü\u00d2\u00d1\u00be\u00ad\u00cd\u00a3\u00d6\u00b9\u00bbò\u00d0\u00b6\u00d4\u00d8\u00a1\u00a3
+plugin.errorMsg04 = æ æ³æ¾å°è¦æ¿æ¢ç模åã请确认该模åæ¯å¦å·²è¢«åæ¢æè
å¸è½½ã
plugin.infoMsg01 = æåé¨ç½²åºç¨
plugin.infoMsg02 = æåéæ°é¨ç½²åºç¨
plugin.infoMsg03 = æåå¯å¨åºç¨
Modified: geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties Mon Dec 7 08:10:25 2009
@@ -16,24 +16,24 @@
#=====================================================================
classloaderview.help.content = This view can be used to all the classloader involved in server and the classes it loads.
-classloaderview.help.title = This is the help for the Geronimo Administration Classloader VIEW page.
+classloaderview.help.title = Classloader Viewer Help
classloaderview.view.invertTree = Invert Tree
classloaderview.view.searchOnlySelected = Search only selected
classloaderview.view.searchText = Search Text
debugviews.common.find = Find
debugviews.common.findNext = Find Next
-debugviews.common.notFound = Can not find
-debugviews.common.pleaseSelect = Please selecte one node
+debugviews.common.notFound = Cannot find
+debugviews.common.pleaseSelect = Select one node
debugviews.common.noText = No text to search
-dependencyview.help.summary = This view can be used to all the modules and its dependencies.
-dependencyview.help.title = This is the help for the Geronimo Administration Dependency VIEW page.
+dependencyview.help.summary = This view can be used to view all the modules and its dependencies.
+dependencyview.help.title = Dependency Viewer Help
dependencyview.view.searchOnlySelected = Search only selected
dependencyview.view.searchText = Search Text
jmxmanager.help.JMXTree = JMX Tree
-jmxmanager.help.JMXTreeExp1 = <li>You can use this tree to view the different types of MBeans</li> <li>Each MBean will be represented as a tree node that shows its object name representation</li><li>'All MBeans' will give you a list of MBeans grouped by its domain</li> <li>'J2EE MBeans' will give you a list of MBeans grouped by JSR 77 MBean types:</li>
+jmxmanager.help.JMXTreeExp1 = <li>You can view different types of MBeans in the JMX tree.</li> <li>Each MBean will be represented as a tree node that shows its object name representation</li><li>'All MBeans' will give you a list of MBeans grouped by its domain</li> <li>'J2EE MBeans' will give you a list of MBeans grouped by JSR 77 MBean types:</li>
jmxmanager.help.abstractName = Abstract Name
jmxmanager.help.attributes = Attributes
jmxmanager.help.attributesTab = Attributes Tab
@@ -59,7 +59,7 @@
jmxmanager.help.search = Search
jmxmanager.help.searchMBeansExp = 'Search MBeans' will give you a list of MBeans matching a pattern from the 'Search' tab
jmxmanager.help.searchTab = Search Tab
-jmxmanager.help.searchTabExp = <ul> <li>You can use this tab to query MBeans matching a particular pattern</li> <li>Matching MBeans will be added under the 'Search MBeans' tree node. You might need to scroll down the JMX tree to view results.</li> <li>Examples of Object Name Patterns:</li> <ul> <li>"*:*" - will return all the MBeans <li>"geronimo:*" - will return all MBeans with "geronimo" domain <li>"*:j2eeType=GBean,*" - will return all GBeans </ul> </ul>
+jmxmanager.help.searchTabExp = <ul> <li>You can use this tab to query MBeans matching a particular pattern</li> <li>Matching MBeans will be added under the 'Search MBeans' tree node. You might need to scroll down the JMX tree to view results.</li> <li>Examples of Object Name Patterns:</li> <ul> <li>"*:*" - will return all the MBeans <li>"geronimo:*" - will return all MBeans with "Geronimo" domain <li>"*:j2eeType=GBean,*" - will return all GBeans </ul> </ul>
jmxmanager.help.setter = Setter
jmxmanager.help.stats = Stats
jmxmanager.help.statsTab = Stats Tab
@@ -72,7 +72,7 @@
jmxmanager.help.viewStats = View Stats
jndiview.help.content = This view can be used to view JNDI context for various modules.
-jndiview.help.title = This is the help for the Geronimo Administration JNDI VIEW page.
+jndiview.help.title = JNDI Viewer Help
jndiview.view.caseSensitive = Case Sensitive
jndiview.view.searchOnlySelected = Search only selected
jndiview.view.searchText = Search Text
Author: genspring
Date: Mon Dec 7 08:10:25 2009
New Revision: 887859
URL: http://svn.apache.org/viewvc?rev=887859&view=rev
Log:
GERONIMO-4977 Geronimo EN/Simp.Chinese UI information improvement for Console, thanks Jeff for the patch !
Modified:
geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties
geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties
geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/ToolTips.properties
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/i18n-resources/portaldriver_en.properties
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_zh.properties
geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_en.properties
geronimo/server/branches/2.2/plugins/debugviews/debugviews-portlets/src/main/i18n-resources/debugviews_zh.properties
geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_en.properties
geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/monitor-portlet_zh.properties
geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/branches/2.2/plugins/monitoring/mconsole-war/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/branches/2.2/plugins/openejb/openejb-portlets/src/main/i18n-resources/openejb-portlet_en.properties (contents, props changed)
geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/plancreator-portlet_en.properties
geronimo/server/branches/2.2/plugins/plancreator/plancreator-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties
geronimo/server/branches/2.2/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_en.properties Mon Dec 7 08:10:25 2009
@@ -27,27 +27,27 @@
jmsmanager.activemq.common.poolMaxCapacityExp = Maximum connection pool size.
jmsmanager.activemq.common.serverURL = Server URL
jmsmanager.activemq.common.serverURLExp = URL of the server to connect to.
-jmsmanager.activemq.common.testConn = test connection
+jmsmanager.activemq.common.testConn = Test connection
jmsmanager.activemq.common.testResult = Test Result
jmsmanager.activemq.common.userNameExp = User name to use.
jmsmanager.activemq.config.passwordsNotMatch = Passwords did not match
jmsmanager.activemq.config.repeatPassword = Repeat Password
-jmsmanager.activemq.config.serverUrl = ServerUrl
-jmsmanager.activemq.config.userName = UserName
+jmsmanager.activemq.config.serverUrl = Server Url
+jmsmanager.activemq.config.userName = User Name
jmsmanager.activemq.help.addNewJMSConnFactoryExp = This link brings up a form for adding a new connection factory. The fields are defined on the form.
-jmsmanager.activemq.help.detailExp = This link provides details on the connector. Clicking on the details link will display information about the Connection Factory in Property/Value pairs. Click on the "Back to JMS Connection Factories" button to return to the main JMS Connection Factories page.
+jmsmanager.activemq.help.detailExp = This link provides details on the connector. Click the details link to display information about the Connection Factory in Property/Value pairs. Click the "Back to JMS Connection Factories" button to return to the main JMS Connection Factories page.
jmsmanager.activemq.help.nameExp = Name of the connection factory.
jmsmanager.activemq.help.stateExp = The state of the connection, either "Running" or "Stopped."
jmsmanager.activemq.help.testConnExp = This link can be used to test the connector. A result will be returned of either "Connected" or a failure message.
jmsmanager.activemq.help.title = This portlet displays the JMS connectors that are configured with the Geronimo server.
jmsmanager.broker.cancel = Cancel
-jmsmanager.broker.confirmMsg01 = Are you sure you want to delete
-jmsmanager.broker.creationtip = Please edit the ActiveMQ XML template configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker
+jmsmanager.broker.confirmMsg01 = Are you sure that you want to delete?
+jmsmanager.broker.creationtip = Edit the ActiveMQ XML template configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker
jmsmanager.broker.emptyText = The focussed field must not be empty.
-jmsmanager.broker.emptybrokerconfig = ActiveMQ XML configuration could not be empty
-jmsmanager.broker.emptybrokername = Broker name could not be empty
+jmsmanager.broker.emptybrokerconfig = ActiveMQ XML configuration must not be empty
+jmsmanager.broker.emptybrokername = Broker name must not be empty
jmsmanager.broker.ok = OK
-jmsmanager.broker.updatetip = Please edit the ActiveMQ XML configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker.
+jmsmanager.broker.updatetip = Edit the ActiveMQ XML configuration file in the edit box below, then click the save buttion to save the changes and redeploy the broker.
jmsmanager.common.actions = Actions
jmsmanager.common.addNewDatasource = Add New Datasource
jmsmanager.common.addQueue_Topic = Add Queue/Topic
@@ -60,12 +60,12 @@
jmsmanager.common.correlationID = CorrelationID
jmsmanager.common.create = Create
jmsmanager.common.currentDepth = Current Depth
-jmsmanager.common.delete = delete
+jmsmanager.common.delete = Delete
jmsmanager.common.description = Description
jmsmanager.common.destination = Destination
jmsmanager.common.destinationPhysicalName = Destination Physical Name
-jmsmanager.common.detail = detail
-jmsmanager.common.edit = edit
+jmsmanager.common.detail = Detail
+jmsmanager.common.edit = Edit
jmsmanager.common.expiration = Expiration
jmsmanager.common.host = Host
jmsmanager.common.hostExp = The host name or IP to bind to. The normal values are <tt>0.0.0.0</tt> (all interfaces) or <tt>localhost</tt> (local connections only)
@@ -90,14 +90,14 @@
jmsmanager.common.protocol = Protocol
jmsmanager.common.refresh = Refresh
jmsmanager.common.remove = Remove
-jmsmanager.common.replyTo = ReplyTo
+jmsmanager.common.replyTo = Reply To
jmsmanager.common.reset = Reset
jmsmanager.common.save = Save
jmsmanager.common.sharable = Sharable
jmsmanager.common.start = start
jmsmanager.common.state = State
jmsmanager.common.statiscticFor = Statistic for {0}
-jmsmanager.common.stop = stop
+jmsmanager.common.stop = Stop
jmsmanager.common.submit = Submit
jmsmanager.common.testConn = test connection
jmsmanager.common.timestamp = Timestamp
@@ -105,23 +105,23 @@
jmsmanager.common.type = Type
jmsmanager.common.userName = User Name
jmsmanager.common.value = Value
-jmsmanager.common.viewDLQ = view DLQ
-jmsmanager.common.viewMessages = view messages
-jmsmanager.connectionhelp.addNewDatasourceExp = Clicking on this link allows the user to add a new datasource. On the add new datasource form, fill in the fields and click on the Create button to add the new datasource. The fields are defined on the form itself.
-jmsmanager.connectionhelp.detailExp = This link provides details on the connector. Clicking on the details link will display information about the Connection Factory in Property/Value pairs. Click on "Back to Datasources" to return to the main JMS Connection Factories page.
+jmsmanager.common.viewDLQ = View DLQ
+jmsmanager.common.viewMessages = View messages
+jmsmanager.connectionhelp.addNewDatasourceExp = Click this link to add a new datasource. On the add new datasource form, fill in the fields and click the Create button to add the new datasource. The fields are defined on the form itself.
+jmsmanager.connectionhelp.detailExp = This link provides details on the connector. Click the details link to display information about the Connection Factory in Property/Value pairs. Click on "Back to Datasources" to return to the main JMS Connection Factories page.
jmsmanager.connectionhelp.nameExp = Name of the Connection Factory.
jmsmanager.connectionhelp.stateExp = The state of the connection, either "Running" or "Stopped."
jmsmanager.connectionhelp.testConnExp = This link can be used to test the connector. A result will be returned of either "Connected" or a failure message.
jmsmanager.connectionhelp.title = This portlet displays the JMS connectors that are configured with the Geronimo server and allows the user to add datasources as well.
-jmsmanager.help.addQueue_TopicExp = To create a queue/topic click on the "Add Queue/Topic" link. This link brings up a form that allows the user to add a queue or a topic. Fill in the text boxes on the form and click on the "Submit" button. The fields and buttons on the form are defined as follows:
+jmsmanager.help.addQueue_TopicExp = To create a queue/topic, click the "Add Queue/Topic" link. This link brings up a form that allows the user to add a queue or a topic. Fill in the text boxes on the form and click the "Submit" button. The fields and buttons on the form are defined as follows:
jmsmanager.help.applicationNameExp = This is the "configID" in the geronimo-web.xml file. Or this can be set to the string "null" if the admin object is deployed stand-alone. By default this field contains the string "null."
jmsmanager.help.backBtnExp = The Back button returns the user to the "JMS Destination Manager" main page without adding a queue or a topic.
jmsmanager.help.clearBtnExp = The Clear button resets all input fields to the default values.
jmsmanager.help.destinationPhysicalNameExp = The name of the connection factory that ActiveMQ knows about.
jmsmanager.help.messageDestinationNameExp = The name of the queue or topic. This is the name used in the admin object gbean name and is linked to by <message-destination-link> in the geronimo-web.xml plan.
-jmsmanager.help.moduleNameExp = If the module is deployed stand-alone this field is the "configID" in the geronimo-web.xml file. If it is deployed in an application (ear) this field should be the path of the module inside the ear, such as, myResourceAdapter.rar. By default this field contains "defaultJMS."
+jmsmanager.help.moduleNameExp = If the module is deployed stand-alone, this field is the "configID" in the geronimo-web.xml file. If it is deployed in an application (ear), this field should be the path of the module inside the ear, such as, myResourceAdapter.rar. By default this field contains "defaultJMS."
jmsmanager.help.submitBtnExp = The Submit button creates a new queue or topic and returns the user to the JMS Destination Manager main page.
-jmsmanager.help.summary = <p>On the main JMS Destination Manager pane, there is an "Actions" column that provides three actions which can be performed on a queue or topic. To remove a queue or topic, click on the "remove" link to the right of the queue/topic to be removed. To view a message, click on the "view messages" link to the right of the queue/topic. To view the dead letter queue, click on the "view DLQ" link.</p><p> <strong>Note:</strong> Queues/Topics with no messages will be removed after restarting the server.</p>
+jmsmanager.help.summary = <p>On the main JMS Destination Manager pane, there is an "Actions" column that provides three actions which can be performed on a queue or topic. To remove a queue or topic, click the "remove" link to the right of the queue/topic to be removed. To view a message, click the "view messages" link to the right of the queue/topic. To view the dead letter queue, click the "view DLQ" link.</p><p> <strong>Note:</strong> Queues/Topics with no messages will be removed after restarting the server.</p>
jmsmanager.help.title = This portlet is used to create and remove queues/topics.
jmsmanager.help.typeExp = The type of message, either queue or topic.
jmsmanager.sendmessage.correlationId = JMS Correlation ID
@@ -137,9 +137,9 @@
jmsmanager.sendmessage.type = Type
jmsmanager.server.connector.editGeneric.addJMSConnector = Add new {0} connector for {1}
jmsmanager.server.connector.editGeneric.editJMSConnector = Edit {0} connector {1} for {2}.
-jmsmanager.server.connector.editGeneric.namingJMSConnectors = A name that is different than the name for any other JMS connectors in the server
+jmsmanager.server.connector.editGeneric.namingJMSConnectors = A name that is different from the name for any other JMS connectors in the server
jmsmanager.server.connector.editGeneric.uniqueName = Unique Name
-jmsmanager.server.connector.editGeneric.uniqueNameExp = A name that is different than the name for any other JMS connectors in the server
+jmsmanager.server.connector.editGeneric.uniqueNameExp = A name that is different from the name for any other JMS connectors in the server
jmsmanager.server.connector.help.title = Shows all the network connectors configured for the currently available JMS brokers. Lets you start, stop, add, remove, and edit JMS network connectors.
jmsmanager.server.connector.normal.addConnectorTo = Add connector to {0}
jmsmanager.server.connector.normal.addNewParaListener = Add new <b>{0}</b> listener
@@ -206,7 +206,7 @@
jmswizard.list.serverWide = Server-wide
jmswizard.list.title = This page lists all the available JMS Resource Groups.
jmswizard.plan.JMSProviderRAR = JMS Provider RAR
-jmswizard.plan.JMSProviderRARExp = The Resource Adapter RAR that can be used to connect to the JMS provider in question. This RAR should be installed under GERONIMO/repository/ in order for it to appear in this list.
+jmswizard.plan.JMSProviderRARExp = The Resource Adapter RAR that can be used to connect to the JMS provider in question. This RAR must be installed under GERONIMO/repository/ in order for it to appear in this list.
jmswizard.plan.addToEAR = Add to EAR
jmswizard.plan.addToEARExp = Instead of deploying as a top-level JMS resource, you can deploy this pool as part of an EAR. To add a JMS resource to an EAR using this plan:<ol> <li>Copy and paste the plan to a file</li> <li>Save the plan file to the top level of your EAR</li> <li>Copy the RAR file from <tt>{0}</tt> to the top level of your EAR</li> <li>Create a <tt>META-INF/geronimo-application.xml</tt> file in your EAR that has a <tt>module</tt> entry like this (substituting the correct RAR file name and plan file name):</li></ol>
jmswizard.plan.deployCommand = Deploy Command
@@ -218,7 +218,7 @@
jmswizard.provider.JMSProviderRAR = JMS Provider RAR
jmswizard.provider.JMSProviderRARExp = The Resource Adapter RAR that can be used to connect to the JMS provider in question. This RAR should be installed under GERONIMO/repository/ in order for it to appear in this list.
jmswizard.provider.title = <b>JMS Resource Group</b> -- Select JMS Provider RAR
-jmswizard.raInstance.BrokerXmlConfig = Sets the XML configuration file used to configure the embedded ActiveMQ broker via Spring if using embedded mode.<br>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas file:dir/file.xml would use the file system. Any valid URL string is supported.
+jmswizard.raInstance.BrokerXmlConfig = Sets the XML configuration file used to configure the embedded ActiveMQ broker by Spring if using embedded mode.<br>BrokerXmlConfig is the filename which is assumed to be on the classpath unless a URL is specified. So a value of foo/bar.xml would be assumed to be on the classpath whereas file:dir/file.xml would use the file system. Any valid URL string is supported.
jmswizard.raInstance.Clientid = The client id that will be set on the connection that is established to the ActiveMQ server.
jmswizard.raInstance.Password = The default password that will be used to log the default user into the ActiveMQ server.
jmswizard.raInstance.ServerUrl = The URL to the ActiveMQ server that you want this connection to connect to. If using an embedded broker, this value should be 'vm://localhost'.
@@ -232,8 +232,8 @@
jmswizard.status.addConnFactory = Add Connection Factory
jmswizard.status.addDestination = Add Destination
jmswizard.status.deployNow = Deploy Now
-jmswizard.status.factoriesDestinationsAdded = These are the connection factories and destinations you've added to the JMS resource group so far. When you're finished adding connection factories and destinations, you can review the Geronimo deployment plan for this resource group, or go ahead and deploy it.
-jmswizard.status.noFactoriesDestinations = So far, you've entered the basic configuration information required for a JMS resource group. Now you can create connection factories and destinations. When you're finished adding connection factories and destinations, you can review the Geronimo deployment plan for this JMS resource group, or go ahead and deploy it.
+jmswizard.status.factoriesDestinationsAdded = These are the connection factories and destinations you've added to the JMS resource group so far. When you've finished adding connection factories and destinations, you can review the Geronimo deployment plan for this resource group, or go ahead and deploy it.
+jmswizard.status.noFactoriesDestinations = So far, you've entered the basic configuration information required for a JMS resource group. Now you can create connection factories and destinations. When you've finished adding connection factories and destinations, you can review the Geronimo deployment plan for this JMS resource group, or go ahead and deploy it.
jmswizard.status.resourceGroup = Resource Group
jmswizard.status.showPlan = Show Plan
jmswizard.status.title = <b>JMS Resource Group</b> -- Current Progress
Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/activemq_zh.properties Mon Dec 7 08:10:25 2009
@@ -16,8 +16,8 @@
# limitations under the License.
#=====================================================================
-jmsmanager.activemq.addACF.nameExp = 该ActiveMQè¿æ¥å·¥åçå称
-jmsmanager.activemq.common.addNewJMSConnFactory = æ·»å æ°çJMSè¿æ¥å·¥å
+jmsmanager.activemq.addACF.nameExp = 该 ActiveMQ è¿æ¥å·¥åçå称
+jmsmanager.activemq.common.addNewJMSConnFactory = æ·»å æ°ç JMS è¿æ¥å·¥å
jmsmanager.activemq.common.blockingTimeout = å µå¡è¶
æ¶(毫ç§)
jmsmanager.activemq.common.blockingTimeoutExp = å µå¡è¶
æ¶(毫ç§)
jmsmanager.activemq.common.connName = è¿æ¥å称
@@ -25,23 +25,23 @@
jmsmanager.activemq.common.passwordExp = 对åºç¨æ·åçå¯ç
jmsmanager.activemq.common.poolMaxCapacity = è¿æ¥æ± æ大è¿æ¥æ°
jmsmanager.activemq.common.poolMaxCapacityExp = è¿æ¥æ± æ大è¿æ¥æ°
-jmsmanager.activemq.common.serverURL = æå¡å¨URL
+jmsmanager.activemq.common.serverURL = æå¡å¨ URL
jmsmanager.activemq.common.serverURLExp = è¿æ¥æå¡å¨çå°å
jmsmanager.activemq.common.testConn = æµè¯è¿æ¥
jmsmanager.activemq.common.testResult = æµè¯ç»æ
jmsmanager.activemq.common.userNameExp = 使ç¨çç¨æ·å
jmsmanager.activemq.config.passwordsNotMatch = å¯ç ä¸å¹é
jmsmanager.activemq.config.repeatPassword = 确认å¯ç
-jmsmanager.activemq.config.serverUrl = æå¡å¨URL
+jmsmanager.activemq.config.serverUrl = æå¡å¨ URL
jmsmanager.activemq.config.userName = ç¨æ·å
-jmsmanager.activemq.help.addNewJMSConnFactoryExp = 该è¿æ¥ç¨äºæå¼æ·»å æ°è¿æ¥å·¥åç表å
-jmsmanager.activemq.help.detailExp = 该é¾æ¥æä¾è¿æ¥å¨ç详ç»ä¿¡æ¯, ç¹å»è¯¥é¾æ¥ä¼ä»¥å±æ§åå对åºå¼çæ¹å¼æ¾ç¤ºè¿æ¥å·¥åçä¿¡æ¯. ç¹å»"è¿åJMSè¿æ¥å·¥å"æé®å°è¿åJMSå·¥åå表页é¢
+jmsmanager.activemq.help.addNewJMSConnFactoryExp = 该é¾æ¥ç¨äºæå¼æ·»å æ°è¿æ¥å·¥åç表å
+jmsmanager.activemq.help.detailExp = 该é¾æ¥æä¾è¿æ¥å¨ç详ç»ä¿¡æ¯, ç¹å»è¯¥é¾æ¥ä¼ä»¥å±æ§åå对åºå¼çæ¹å¼æ¾ç¤ºè¿æ¥å·¥åçä¿¡æ¯. ç¹å»"è¿å JMS è¿æ¥å·¥å"æé®å°è¿å JMS å·¥åå表页é¢
jmsmanager.activemq.help.nameExp = è¿æ¥å·¥åçå称
jmsmanager.activemq.help.stateExp = è¿æ¥çç¶æ,å
å«"è¿è¡"å"åæ¢"ç¶æ
-jmsmanager.activemq.help.testConnExp = 该è¿æ¥ç¨äºæµè¯è¿æ¥å¨, å°è¿å"æåè¿æ¥"æè
ä¸ä¸ªé误信æ¯ã
-jmsmanager.activemq.help.title = 该Portletæ¾ç¤ºå¨Geronimoæå¡å¨ä¸é
ç½®çJMSè¿æ¥å¨
+jmsmanager.activemq.help.testConnExp = 该é¾æ¥ç¨äºæµè¯è¿æ¥å¨, å°è¿å"æåè¿æ¥"æè
ä¸ä¸ªé误信æ¯ã
+jmsmanager.activemq.help.title = 该 Portle tæ¾ç¤ºå¨ Geronimo æå¡å¨ä¸é
ç½®ç JMS è¿æ¥å¨
jmsmanager.broker.cancel = åæ¶
-jmsmanager.broker.confirmMsg01 = ä½ ç¡®å®è¦å é¤
+jmsmanager.broker.confirmMsg01 = ä½ ç¡®å®è¦å é¤?
jmsmanager.broker.creationtip = 请ç¼è¾ä¸é¢ç¼è¾æ¡ä¸ç ActiveMQ XML 模æ¿é
ç½®æ件, ç¶åç¹å»ä¿åæé®ä¿åä¿®æ¹å¹¶é¨ç½²è¯¥ Broker
jmsmanager.broker.emptyText = ç¦ç¹æå¨å段ä¸è½ä¸ºç©ºã
jmsmanager.broker.emptybrokerconfig = ActiveMQ XML é
ç½®ä¸å¯ä¸ºç©º
@@ -68,15 +68,15 @@
jmsmanager.common.edit = ç¼è¾
jmsmanager.common.expiration = æªæ¢
jmsmanager.common.host = 主æº
-jmsmanager.common.hostExp = è¦ç»å®å°ç主æºå称æè
IPå°åãé常å¼ä¸º<tt>0.0.0.0</tt> (all interfaces) æè
<tt>localhost</tt> ï¼åªç¨äºæ¬æºè¿æ¥ï¼
+jmsmanager.common.hostExp = è¦ç»å®å°ç主æºå称æè
IP å°åãé常å¼ä¸º<tt>0.0.0.0</tt> (all interfaces) æè
<tt>localhost</tt> ï¼åªç¨äºæ¬æºè¿æ¥ï¼
jmsmanager.common.inhibitGet = ç¦æ¢ Get
jmsmanager.common.inhibitPut = ç¦æ¢ Put
-jmsmanager.common.listJMSConnectors = ååºJMSè¿æ¥å¨
+jmsmanager.common.listJMSConnectors = ååº JMS è¿æ¥å¨
jmsmanager.common.maximumDepth = æ大深度
jmsmanager.common.maximumMessageLength = æ¶æ¯æ大é¿åº¦
jmsmanager.common.message = æ¶æ¯
jmsmanager.common.messageDestinationName = æ¶æ¯ç®çå°å称
-jmsmanager.common.messageID = æ¶æ¯ID
+jmsmanager.common.messageID = æ¶æ¯ ID
jmsmanager.common.moduleName = 模åå
jmsmanager.common.name = å称
jmsmanager.common.openInputCount = Open Input Count
@@ -108,19 +108,19 @@
jmsmanager.common.viewDLQ = æ¥ç DLQ
jmsmanager.common.viewMessages = æ¥çæ¶æ¯
jmsmanager.connectionhelp.addNewDatasourceExp = ç¹å»è¯¥é¾æ¥å
许ç¨æ·æ·»å æ°çæ°æ®æº. å¨æ°æ®æºæ·»å 表åä¸, å¡«åè¾å
¥å段并ç¹å»å建æé®æ¥æ·»å æ°çæ°æ®æº
-jmsmanager.connectionhelp.detailExp = 该é¾æ¥æä¾è¿æ¥å¨è¯¦ç»æ
åµ, ç¹å»è¯¥é¾æ¥å°ä»¥é®å¼å¯¹çå½¢å¼æ¾ç¤ºç¸å
³çä¿¡æ¯.ç¹å»'è¿å'æé®å¯è¿åJMSè¿æ¥å·¥å主页é¢
+jmsmanager.connectionhelp.detailExp = 该é¾æ¥æä¾è¿æ¥å¨è¯¦ç»æ
åµ, ç¹å»è¯¥é¾æ¥å°ä»¥é®å¼å¯¹çå½¢å¼æ¾ç¤ºç¸å
³çä¿¡æ¯.ç¹å»'è¿å'æé®å¯è¿å JMS è¿æ¥å·¥å主页é¢
jmsmanager.connectionhelp.nameExp = è¿æ¥å·¥åçå称
jmsmanager.connectionhelp.stateExp = è¿æ¥çç¶æ, å
æ¬'è¿è¡'å'åæ¢'
jmsmanager.connectionhelp.testConnExp = 该é¾æ¥ç¨äºæµè¯è¿æ¥å¨, å°è¿å"æåè¿æ¥"æè
ä¸ä¸ªé误信æ¯ã
-jmsmanager.connectionhelp.title = 该Portletæ¾ç¤ºå¨Geronimoæå¡å¨ä¸é
置并å
许添å æ°æ®æºçJMSè¿æ¥å¨
+jmsmanager.connectionhelp.title = 该 Portlet æ¾ç¤ºå¨ Geronimo æå¡å¨ä¸é
置并å
许添å æ°æ®æºçJMSè¿æ¥å¨
jmsmanager.help.addQueue_TopicExp = ç¹å»'æ·»å éåæ主é¢'é¾æ¥å¯ä»¥å建éåæè
主é¢.该é¾æ¥å°æå¼ç¨æ·å¯ç¨äºæ·»å éåæè
主é¢ç表å.å¡«å表åä¸çè¾å
¥æ¡å¹¶ç¹å»'æ交'æé®. 表åä¸çå段åæé®ä»¥å¦ä¸å½¢å¼å®ä¹"
-jmsmanager.help.applicationNameExp = 该项对åºäºgeronimo-web.xmlä¸ç'configID'.å¦æ该管ç对象é¨ç½²æ'stand-alone'å½¢å¼, å¯ä»¥è®¾ç½®æ'null'.
-jmsmanager.help.backBtnExp = è¿åæé®ç¨äºç´æ¥è¿åå°'JMSç®æ 管ç'页é¢, åæ¶æ·»å éåæ主é¢çæä½
+jmsmanager.help.applicationNameExp = 该项对åºäº geronimo-web.xml ä¸ç 'configID '.å¦æ该管ç对象é¨ç½²æ 'stand-alone' å½¢å¼, å¯ä»¥è®¾ç½®æ'null'.
+jmsmanager.help.backBtnExp = è¿åæé®ç¨äºç´æ¥è¿åå° 'JMS ç®æ 管ç'页é¢, åæ¶æ·»å éåæ主é¢çæä½
jmsmanager.help.clearBtnExp = æ¸
é¤æé®ç¨äºéç½®ææè¾å
¥æ¡å°é»è®¤å¼
-jmsmanager.help.destinationPhysicalNameExp = ActiveMQå¯è¯å«çè¿æ¥å·¥åçåå
+jmsmanager.help.destinationPhysicalNameExp = ActiveMQ å¯è¯å«çè¿æ¥å·¥åçåå
jmsmanager.help.messageDestinationNameExp = éåæ主é¢çå称, 该å称ç¨äºç®¡ç对象çgbeanå称,并ä¸geronimo-web.xmlé¨ç½²è®¡åä¸ç'message-destination-link'å段å
³è
-jmsmanager.help.moduleNameExp = å¦æ模å以'stand-alone'å½¢å¼é¨ç½², 该å段对åºäºgeronimo-web.xmlä¸ç'configID'. å¦æé¨ç½²äºä¸ä¸ªåºç¨ç¨åº(ear)ä¸, 该å段åºä¸ºå¨earä¸è¯¥æ¨¡åçè·¯å¾, ä¾å¦, myResourceAdapter.rar. é»è®¤æ
åµä¸è¯¥å段å
å«'defaultJMS'.
-jmsmanager.help.submitBtnExp = æ交åå°å建ä¸ä¸ªæ°çéåæè
主é¢, 并è¿åå°JMSç®æ 管ç页é¢
+jmsmanager.help.moduleNameExp = å¦æ模å以'stand-alone'å½¢å¼é¨ç½², 该å段对åºäº geronimo-web.xml ä¸ç'configID'. å¦æé¨ç½²äºä¸ä¸ªåºç¨ç¨åº(ear)ä¸, 该å段åºä¸ºå¨earä¸è¯¥æ¨¡åçè·¯å¾, ä¾å¦, myResourceAdapter.rar. é»è®¤æ
åµä¸è¯¥å段å
å«'defaultJMS'.
+jmsmanager.help.submitBtnExp = æ交åå°å建ä¸ä¸ªæ°çéåæè
主é¢, 并è¿åå° JMS ç®æ 管ç页é¢
jmsmanager.help.summary = <p>å¨JMSç®ç管ç页é¢ä¸, 'æä½'åæä¾ä¸ç±»é对éåæ主é¢çæä½. å é¤ä¸ä¸ªéåæ主é¢, ç¹å»å
¶å³ä¾§ç'å é¤'é¾æ¥;æ¥çä¸æ¡æ¶æ¯, ç¹å»å³ä¾§ç'æ¥çæ¶æ¯'é¾æ¥.æ¥çæ»ä¿¡éå, ç¹å»'æ¥ç DLG'é¾æ¥</p><p><strong>注æ:</strong>没ææ¶æ¯çéåæè
主é¢ä¼å¨æå¡å¨éå¯åå é¤</p>
jmsmanager.help.title = 该Portletç¨äºå建åå é¤éåæ主é¢.
jmsmanager.help.typeExp = æ¶æ¯çç±»å, å
æ¬éåæè
主é¢.
@@ -137,25 +137,25 @@
jmsmanager.sendmessage.type = ç±»å
jmsmanager.server.connector.editGeneric.addJMSConnector = Add new {0} connector for {1}
jmsmanager.server.connector.editGeneric.editJMSConnector = Edit {0} connector {1} for {2}.
-jmsmanager.server.connector.editGeneric.namingJMSConnectors = ä¸åäºå½åæå¡å¨ä¸åå¨çJMSè¿æ¥å¨çå称
+jmsmanager.server.connector.editGeneric.namingJMSConnectors = ä¸åäºå½åæå¡å¨ä¸åå¨ç JMS è¿æ¥å¨çå称
jmsmanager.server.connector.editGeneric.uniqueName = å¯ä¸çå称
jmsmanager.server.connector.editGeneric.uniqueNameExp = ç»è¿æ¥å¨åä¸ä¸ªä¸æå¡å¨ä¸ä»»ä½å
¶å®JMSè¿æ¥å¨ä¸åçå称
-jmsmanager.server.connector.help.title = æ¾ç¤ºä¸ºå½åå¯ç¨JMS brokersé
ç½®çææç½ç»è¿æ¥å¨ãä½ å¯ä»¥å¯å¨ï¼åæ¢ï¼æ·»å ï¼å é¤åç¼è¾JMSç½ç»è¿æ¥å¨ã
+jmsmanager.server.connector.help.title = æ¾ç¤ºä¸ºå½åå¯ç¨ JMS broker é
ç½®çææç½ç»è¿æ¥å¨ãä½ å¯ä»¥å¯å¨ï¼åæ¢ï¼æ·»å ï¼å é¤åç¼è¾JMSç½ç»è¿æ¥å¨ã
jmsmanager.server.connector.normal.addConnectorTo = æ·»å è¿æ¥å¨å°{0}
jmsmanager.server.connector.normal.addNewParaListener = æ·»å æ°ç<b>{0}</b>çå¬å¨
jmsmanager.server.connector.normal.confirmDelete = ä½ ç¡®ä¿¡è¦å é¤ {0} ?
-jmsmanager.server.connector.normal.noJMSNetworkConnectors = ä¸åå¨é¢å®ä¹çJMSç½ç»è¿æ¥å¨
-jmsmanager.server.connector.normal.title = å½åå¯ç¨çJMSç½ç»è¿æ¥å¨ï¼
-jmsmanager.server.help.title = æ¾ç¤ºå¯ç¨çJMS brokers
-jmsmanager.server.normal.addJMSBroker = æ·»å æ°çJMS Broker
-jmsmanager.server.normal.noJMSBrokers = ä¸åå¨é¢å®ä¹çJMS brokers
-jmsmanager.server.normal.title = å¨æå¡å¨ä¸å¯ç¨çJMS brokerså
æ¬
+jmsmanager.server.connector.normal.noJMSNetworkConnectors = ä¸åå¨é¢å®ä¹ç JMS ç½ç»è¿æ¥å¨
+jmsmanager.server.connector.normal.title = å½åå¯ç¨ç JMS ç½ç»è¿æ¥å¨ï¼
+jmsmanager.server.help.title = æ¾ç¤ºå¯ç¨ç JMS brokers
+jmsmanager.server.normal.addJMSBroker = æ·»å æ°ç JMS Broker
+jmsmanager.server.normal.noJMSBrokers = ä¸åå¨é¢å®ä¹ç JMS brokers
+jmsmanager.server.normal.title = å¨æå¡å¨ä¸å¯ç¨ç JMS brokers å
æ¬
jmsmanager.viewDLQ.deadLetterQueueName = Dead Letter Queue å称
-jmsmanager.viewDLQ.noMessages = å¨Dead Letter Queueä¸ç没ææ¶æ¯
+jmsmanager.viewDLQ.noMessages = å¨ Dead Letter Queue ä¸ç没ææ¶æ¯
jmsmanager.viewmessages.jsp.noMessagesInDest = ç®æ ä¸æ²¡ææ¶æ¯
jmswizard.common.Browse = æµè§
-jmswizard.common.JMSFactoryType = JMSå·¥åç±»å
+jmswizard.common.JMSFactoryType = JMS å·¥åç±»å
jmswizard.common.Purge = æ¸
é¤
jmswizard.common.Send = åé
jmswizard.common.actions = æä½
@@ -168,7 +168,7 @@
jmswizard.common.connectionFactoryName = è¿æ¥å·¥åå称
jmswizard.common.connectionPoolParameters = è¿æ¥æ± åæ°
jmswizard.common.consumerCount = æ¶è´¹è
æ»æ°
-jmswizard.common.currentStatusForJMSResourceGroup = JMSèµæºç»{0}çå½åç¶æ
+jmswizard.common.currentStatusForJMSResourceGroup = JMS èµæºç»{0}çå½åç¶æ
jmswizard.common.deployedAs = é¨ç½²ä¸º
jmswizard.common.destination = ç®æ
jmswizard.common.emptyText = ç¦ç¹æå¨å段ä¸è½ä¸ºç©ºã
@@ -193,47 +193,47 @@
jmswizard.destination.destinationConfSettings = ç®çå°é
ç½®
jmswizard.destination.messageDestinationName = æ¶æ¯ç®çå°å称
jmswizard.destination.title = <b>JMSèµæºç»</b> -- é
ç½®ç®çå°
-jmswizard.destinationType.JMSDestinationType = JMSç®çå°ç±»å
+jmswizard.destinationType.JMSDestinationType = JMS ç®çå°ç±»å
jmswizard.destinationType.selectDesiredInterfacetype = è¿ä¸ªèµæºéé
å¨å£°æäºå 个å¯è½ç®çå°æ¥å£ã为è¿ä¸ªç®çå°éæ©æ³è¦çæ¥å£ç±»åã
-jmswizard.destinationType.title = <b>JMSèµæºç»</b> -- éæ©ç®çå°ç±»å
-jmswizard.factory.title = <b>JMSèµæºç»</b> -- é
ç½®è¿æ¥å·¥å
-jmswizard.factoryType.title = <b>JMSèµæºç»</b> -- éæ©è¿æ¥å·¥åç±»å
+jmswizard.destinationType.title = <b>JMS èµæºç»</b> -- éæ©ç®çå°ç±»å
+jmswizard.factory.title = <b>JMS èµæºç»</b> -- é
ç½®è¿æ¥å·¥å
+jmswizard.factoryType.title = <b>JMS èµæºç»</b> -- éæ©è¿æ¥å·¥åç±»å
jmswizard.list.applicationScoped = åºç¨ç¨åºèå´
jmswizard.list.comfirmMsg01 = ç¡®å®æ¸
é¤æ¶æ¯ï¼
-jmswizard.list.createJMSResourceGroup = å建æ°çJMSèµæºç»:
-jmswizard.list.forAnotherJMSProvider = å
¶ä»JMSæä¾è
...
-jmswizard.list.noJMSResourceGroups = 没æé¢å®ä¹çJMSèµæºç»
+jmswizard.list.createJMSResourceGroup = å建æ°ç JMS èµæºç»:
+jmswizard.list.forAnotherJMSProvider = å
¶ä» JMS æä¾è
...
+jmswizard.list.noJMSResourceGroups = 没æé¢å®ä¹ç JMS èµæºç»
jmswizard.list.serverWide = æå¡ç«¯
-jmswizard.list.title = è¿ä¸ªé¡µé¢ååºäºææå¯ç¨çJMSèµæºç».
+jmswizard.list.title = è¿ä¸ªé¡µé¢ååºäºææå¯ç¨ç JMS èµæºç».
jmswizard.plan.JMSProviderRAR = JMS Provider RAR
-jmswizard.plan.JMSProviderRARExp = ç¨äºè¿æ¥å½åJMSæä¾è
çèµæºéé
RARå
. RARå
åºè¯¥å®è£
å¨GERONIMO/repository/ä¸ä»¥ä¾¿å¨å表ä¸æ¾ç¤º.
+jmswizard.plan.JMSProviderRARExp = ç¨äºè¿æ¥å½å JMS æä¾è
çèµæºéé
RAR å
. RAR å
åºè¯¥å®è£
å¨ GERONIMO/repository/ä¸ä»¥ä¾¿å¨å表ä¸æ¾ç¤º.
jmswizard.plan.addToEAR = æ·»å å°EAR
-jmswizard.plan.addToEARExp = ä½ å¯ä»¥æè¿ä¸ªJMSæ± é¨ç½²æEARä¸çä¸é¨åï¼èä¸æ¯æå®é¨ç½²æ顶å±çJMSèµæºãè¦å°JMSèµæºæ·»å å°EARä¸ï¼è¯·ä½¿ç¨ä¸é¢çæ¥éª¤ï¼<ol> <li>æ·è´å¹¶ç²å¸é¨ç½²è®¡åå°æ件ä¸</li> <li>ä¿åæ件å°ä½ çEARç顶å±ç®å½</li> <li>ä»<tt>{0}</tt>æ·è´RARæ件å°ä½ çEARç顶å±ç®å½</li> <li>å¨ä½ çEARä¸å建ä¸ä¸ª<tt>META-INF/geronimo-application.xml</tt>ï¼å
¶ä¸æä¸é¢è¿æ ·ç<tt>module</tt>æ¡ç®ï¼æ¿æ¢ææ£ç¡®çRARæ件ååé¨ç½²è®¡åæ件åï¼:</li></ol>
+jmswizard.plan.addToEARExp = ä½ å¯ä»¥æè¿ä¸ª JMS æ± é¨ç½²æ EAR ä¸çä¸é¨åï¼èä¸æ¯æå®é¨ç½²æ顶å±ç JMS èµæºãè¦å° JMS èµæºæ·»å å° EAR ä¸ï¼è¯·ä½¿ç¨ä¸é¢çæ¥éª¤ï¼<ol> <li>æ·è´å¹¶ç²å¸é¨ç½²è®¡åå°æ件ä¸</li> <li>ä¿åæ件å°ä½ ç EAR ç顶å±ç®å½</li> <li>ä»<tt>{0}</tt>æ·è´ RAR æ件å°ä½ ç EAR ç顶å±ç®å½</li> <li>å¨ä½ çEARä¸å建ä¸ä¸ª<tt>META-INF/geronimo-application.xml</tt>ï¼å
¶ä¸æä¸é¢è¿æ ·ç<tt>module</tt>æ¡ç®ï¼æ¿æ¢ææ£ç¡®çRARæ件ååé¨ç½²è®¡åæ件åï¼:</li></ol>
jmswizard.plan.deployCommand = é¨ç½²å½ä»¤
-jmswizard.plan.deployCommandExp = è¦å¨å½ä»¤è¡ä¸ä½¿ç¨è¿ä¸ªé¨ç½²è®¡åæ¥é¨ç½²JMSèµæºï¼è¯·æ·è´å¹¶ç²å¸ä¸é¢çXMLå°æ件ä¸ãï¼æ¯å¦ï¼<tt>plan-file.xml</tt>ï¼ï¼å¹¶ä¿åå®ãç¶åè¿è¡è±¡ä¸é¢çå½ï¼
+jmswizard.plan.deployCommandExp = è¦å¨å½ä»¤è¡ä¸ä½¿ç¨è¿ä¸ªé¨ç½²è®¡åæ¥é¨ç½² JMS èµæºï¼è¯·æ·è´å¹¶ç²å¸ä¸é¢ç XML å°æ件ä¸ãï¼æ¯å¦ï¼<tt>plan-file.xml</tt>ï¼ï¼å¹¶ä¿åå®ãç¶åè¿è¡è±¡ä¸é¢çå½ï¼
jmswizard.plan.deployJMSResource = é¨ç½²JMSèµæº
jmswizard.plan.deploymentPlan = é¨ç½²è®¡å
jmswizard.plan.edit = ç¼è¾è®¾ç½®
jmswizard.plan.title = <b>JMSèµæºç»</b> -- æ¾ç¤ºé¨ç½²è®¡å
jmswizard.provider.JMSProviderRAR = JMS Provider RAR
-jmswizard.provider.JMSProviderRARExp = ç¨äºè¿æ¥å½åJMSæä¾è
çèµæºéé
RARå
. RARå
åºè¯¥å®è£
å¨GERONIMO/repository/ä¸ä»¥ä¾¿å¨å表ä¸æ¾ç¤º.
+jmswizard.provider.JMSProviderRARExp = ç¨äºè¿æ¥å½å JMS æä¾è
çèµæºéé
RA Rå
. RAR å
åºè¯¥å®è£
å¨ GERONIMO/repository/ ä¸ä»¥ä¾¿å¨å表ä¸æ¾ç¤º.
jmswizard.provider.title = <b>JMS èµæºç»</b> -- éæ© JMS Provider RAR
-jmswizard.raInstance.BrokerXmlConfig = å¦æ使ç¨å
åµæ¨¡å¼ï¼è¯·è®¾å®ç¨äºè®¾ç½®å
åµçActiveMQ代ççXML设å®æ件(éè¿Spring)<br>BrokerXmlConfigæ¯è¯¥æ件åï¼å¦æ没ææå®URLçè¯ååå®å®å¨classpathä¸ãæ以å¼foo/bar.xmlå°åå®å¨classpathä¸ï¼èfile:dir/file.xmlå°ä½¿ç¨æ件系ç»ãæ¯æä»»ä½ææçURLå符串ã
-jmswizard.raInstance.Clientid = 建ç«å°ActiveMQæå¡å¨çè¿æ¥ä¸è®¾å®ç客æ·idã
-jmswizard.raInstance.Password = ç¨äºé»è®¤ç¨æ·ç»å½å°ActiveMQæå¡å¨çé»è®¤å¯ç ã
-jmswizard.raInstance.ServerUrl = ä½ æ³è¿æ¥å°çActiveMQæå¡å¨çURLãå¦æ使ç¨å
ç½®ç代çï¼è¿ä¸ªå¼åºè¯¥æ¯'vm://localhost'ã
+jmswizard.raInstance.BrokerXmlConfig = å¦æ使ç¨å
åµæ¨¡å¼ï¼è¯·è®¾å®ç¨äºè®¾ç½®å
åµç ActiveMQ 代çç XML 设å®æ件(éè¿ Spring)<br>BrokerXmlConfigæ¯è¯¥æ件åï¼å¦æ没ææå®URLçè¯ååå®å®å¨ classpath ä¸ãæä»¥å¼ foo/bar.xml å°åå®å¨ classpath ä¸ï¼è file:dir/file.xml å°ä½¿ç¨æ件系ç»ãæ¯æä»»ä½ææçURLå符串ã
+jmswizard.raInstance.Clientid = 建ç«å° ActiveMQ æå¡å¨çè¿æ¥ä¸è®¾å®ç客æ·idã
+jmswizard.raInstance.Password = ç¨äºé»è®¤ç¨æ·ç»å½å° ActiveMQ æå¡å¨çé»è®¤å¯ç ã
+jmswizard.raInstance.ServerUrl = ä½ æ³è¿æ¥å°ç ActiveMQ æå¡å¨ç URLãå¦æ使ç¨å
ç½®ç代çï¼è¿ä¸ªå¼åºè¯¥æ¯'vm://localhost'ã
jmswizard.raInstance.UseInboundSession = å¸å°å¼è®¾å®ä¼ åºçè¿æ¥æ¯å¦åºè¯¥å¤ç¨ä¼ å
¥çè¿æ¥çä¼è¯æ¥åéæ¶æ¯ã
-jmswizard.raInstance.UserName = ç¨äºå»ºç«å°ActiveMQæå¡å¨çè¿æ¥çé»è®¤ç¨æ·åã
+jmswizard.raInstance.UserName = ç¨äºå»ºç«å° ActiveMQ æå¡å¨çè¿æ¥çé»è®¤ç¨æ·åã
jmswizard.raInstance.basicConfigSettings = åºæ¬é
置设置.
jmswizard.raInstance.resourceGroupName = èµæºç»å称
-jmswizard.raInstance.resourceGroupNameExp = ä¸ä¸ªå¯ä¸çèµæºéé
å¨å称ã使ç¨è¿ä¸ªè®¾ç½®æ¥çæèµæºç»çé
ç½®å称ï¼å¹¶å°æ¶æ¯é©±å¨Beanè¿æ¥å°JMSæå¡å¨
+jmswizard.raInstance.resourceGroupNameExp = ä¸ä¸ªå¯ä¸çèµæºéé
å¨å称ã使ç¨è¿ä¸ªè®¾ç½®æ¥çæèµæºç»çé
ç½®å称ï¼å¹¶å°æ¶æ¯é©±å¨ Bean è¿æ¥å° JMS æå¡å¨
jmswizard.raInstance.title = <b>JMSèµæºç»</b> -- é
ç½®æå¡å¨è¿æ¥
-jmswizard.raInstance.titleExp = è¿ä¸ªé¡µé¢è¦è®¾ç½®çå±æ§å¯¹ä¸åçJMSæä¾è
æ¯ä¸ä¸æ ·çï¼ä½æ¯è¿äºé常æ¯é
ç½®å°JMSæå¡å¨çè¿æ¥å±æ§ãä½ å¨ä¸ä¸æ¥å建çè¿æ¥å·¥åï¼æè
ç®çå°é常è¦ä½¿ç¨è¿äºè®¾ç½®ä¸æå¡å¨éä¿¡ã
+jmswizard.raInstance.titleExp = è¿ä¸ªé¡µé¢è¦è®¾ç½®çå±æ§å¯¹ä¸åç JMS æä¾è
æ¯ä¸ä¸æ ·çï¼ä½æ¯è¿äºé常æ¯é
ç½®å°JMSæå¡å¨çè¿æ¥å±æ§ãä½ å¨ä¸ä¸æ¥å建çè¿æ¥å·¥åï¼æè
ç®çå°é常è¦ä½¿ç¨è¿äºè®¾ç½®ä¸æå¡å¨éä¿¡ã
jmswizard.status.addConnFactory = æ·»å è¿æ¥å·¥å
jmswizard.status.addDestination = æ·»å ç®çå°
jmswizard.status.deployNow = ç°å¨é¨ç½²
-jmswizard.status.factoriesDestinationsAdded = è¿æ¯å°ç®å为æ¢ä½ æ·»å çè¿æ¥å·¥ååç®çå°ãå½ä½ å®ææ·»å è¿æ¥å·¥ååç®çå°ä¹åï¼ä½ å¯ä»¥æ¥çè¿ä¸ªJMSèµæºç»çé¨ç½²è®¡åãæè
ç´æ¥é¨ç½²å®ã
-jmswizard.status.noFactoriesDestinations = å°ç®å为æ¢ï¼ä½ å·²ç»ä¸ºJMSèµæºç»çå¡«åäºå¿
é¡»çåºæ¬é
置信æ¯ãç°å¨ä½ å¯ä»¥å建è¿æ¥å·¥ååç®çå°ãå½ä½ å®ææ·»å è¿æ¥å·¥ååç®çå°ä¹åï¼ä½ å¯ä»¥æ¥çè¿ä¸ªJMSèµæºç»çé¨ç½²è®¡åãæè
ç´æ¥é¨ç½²å®ã
+jmswizard.status.factoriesDestinationsAdded = è¿æ¯å°ç®å为æ¢ä½ æ·»å çè¿æ¥å·¥ååç®çå°ãå½ä½ å®ææ·»å è¿æ¥å·¥ååç®çå°ä¹åï¼ä½ å¯ä»¥æ¥çè¿ä¸ª JMS èµæºç»çé¨ç½²è®¡åãæè
ç´æ¥é¨ç½²å®ã
+jmswizard.status.noFactoriesDestinations = å°ç®å为æ¢ï¼ä½ å·²ç»ä¸º JMS èµæºç»çå¡«åäºå¿
é¡»çåºæ¬é
置信æ¯ãç°å¨ä½ å¯ä»¥å建è¿æ¥å·¥ååç®çå°ãå½ä½ å®ææ·»å è¿æ¥å·¥ååç®çå°ä¹åï¼ä½ å¯ä»¥æ¥çè¿ä¸ª JMS èµæºç»çé¨ç½²è®¡åãæè
ç´æ¥é¨ç½²å®ã
jmswizard.status.resourceGroup = èµæºç»
jmswizard.status.showPlan = æ¾ç¤ºé¨ç½²è®¡å
-jmswizard.status.title = <b>JMSèµæºç»</b> -- å½åè¿å±
+jmswizard.status.title = <b>JMS èµæºç»</b> -- å½åè¿å±
Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_en.properties Mon Dec 7 08:10:25 2009
@@ -30,7 +30,7 @@
activemq.errorMsg04 = Error encountered while purging message destination {0}
activemq.infoMsg01 = Message sent successfully.
activemq.infoMsg02 = Deployment completed successfully!
-activemq.warnMsg01 = Can not count Consumer Count/Queue Size of {0} for the server url is not belong to an embedded broker
+activemq.warnMsg01 = Cannot count Consumer Count/Queue Size of {0} for the server url does not belong to an embedded broker
jmsmanager.broker.failAddBroker = Fail to add Broker {0} due to {1}
jmsmanager.broker.failDeleteBroker = Fail to delete the broker {0} due to {1}
Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/i18n-resources/portletinfo_zh.properties Mon Dec 7 08:10:25 2009
@@ -16,13 +16,13 @@
# limitations under the License.
#=====================================================================
-JMS\ Network\ Listeners = JMSç½ç»çå¬å¨
+JMS\ Network\ Listeners = JMS ç½ç»çå¬å¨
-JMS\ Resources = JMSèµæº
+JMS\ Resources = JMS èµæº
-JMS\ Server = JMSæå¡å¨
+JMS\ Server = JMS æå¡å¨
-JMS\ Server\ Manager = JMSæå¡å¨ç®¡ç
+JMS\ Server\ Manager = JMS æå¡å¨ç®¡ç
activemq.errorMsg01 = åéæ¶æ¯æ¶éå°é误ã
activemq.errorMsg02 = é¨ç½²å¤±è´¥ï¼
Modified: geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties?rev=887859&r1=887858&r2=887859&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
(original)
+++ geronimo/server/branches/2.2/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
Mon Dec 7 08:10:25 2009
@@ -21,24 +21,24 @@
car.addRepository.currentlyPluginRepositories = The currently available plugin repositories
are
car.addRepository.downloadRunningCongfig = You can also download running configurations
from another Geronimo server just as if you're browsing and installing third-party plugins.
If you want to point to a remote Geronimo server, enter a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt>
car.addRepository.howToAddPluginRepositories = To add a new plugin repository to this list,
enter the URL to the repository. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository.
-car.addRepository.title = Add Plugin Repository
+car.addRepository.title = Add plugin repository
car.assemblyConfirm.description = Description
car.assemblyConfirm.moduleId = Module ID
car.assemblyConfirm.plugin = Plugin
car.assemblyConfirm.successful = Server Assembly Successful
-car.common.addRepository = Add Repository
+car.common.addRepository = Add repository
car.common.assemble = Assemble
car.common.author = Author
car.common.category = Category
-car.common.createGeronimoPlugin = Create Geronimo Plugin
+car.common.createGeronimoPlugin = Create Geronimo plugin
car.common.dependencies = Dependencies
-car.common.downloadRepositories = Download Repositories
-car.common.exportPlugin = Export Plugin
+car.common.downloadRepositories = Download repositories
+car.common.exportPlugin = Export plugin
car.common.geronimoVersions = Geronimo Versions
car.common.group = Group
car.common.license = License
car.common.moduleID = Module ID
-car.common.newRepository = New Repository
+car.common.newRepository = New repository
car.common.obsoletes = Obsoletes
car.common.openSource = Open Source
car.common.pluginURL = Plugin URL
@@ -53,38 +53,38 @@
car.common.prerequisite3Type = Prerequisite 3 Type
car.common.prerequisites = Prerequisites
car.common.proprietary = Proprietary
-car.common.removePlugins = Remove Geronimo Plugins
+car.common.removePlugins = Remove Geronimo plugins
car.common.repository = Repository
-car.common.savePluginData = Save Plugin Data
-car.common.searchForPlugins = Show Plugins in selected repository
+car.common.savePluginData = Save plugin Data
+car.common.searchForPlugins = Show plugins in selected repository
car.common.uniqueID = Unique ID
car.common.viewDetails = View Details
car.common.webSite = Web Site
-car.confirmExport.title = <b>Export Plugin</b> -- Save
to Disk
+car.confirmExport.title = <b>Export plugin</b> -- Save
to Disk
car.confirmExport.useBtnBelow = Use the button below to save the plugin "{0}"
to disk.
car.download.foundDependencies = Found the following dependencies for this
plugin. Any missing dependencies will be installed for you automatically if you proceed.
car.download.processing = Processing {0}...
car.downloadStatus.processing = Current file being operated on...
-car.help.return = To return to the main Plugin panel select
the "view" link from the header of this portlet.
+car.help.return = To return to the main Plugin panel, select
the "view" link from the header of this portlet.
car.index.assembleServer = Assemble a server
car.index.assembleServerLong = Assemble a server from plugins in this one
car.index.assemblyHelp.AppCentric.desp = Choose the application plugins that suit
your need and let your application plugins define the contents of your server. Your server
should be able to run your applications but may not be able to deploy anything.
car.index.assemblyHelp.AppCentric.title = Application Centric
-car.index.assemblyHelp.ExpertUser.desp = Choose the application plugins and system
plugins by configIds to construct your server. Please only choose this mode when you are
an expert user of Apache Geronimo, because you could end up with a server that is not able
to start or deploy anything.
-car.index.assemblyHelp.ExpertUser.title = Expert Users
+car.index.assemblyHelp.ExpertUser.desp = Choose the application plugins and system
plugins by configIds to construct your server. Choose this mode only when you are an expert
user of Apache Geronimo, because you could end up with a server that is not able to start
or deploy anything.
+car.index.assemblyHelp.ExpertUser.title = Expert User
car.index.assemblyHelp.FuncCentric.desp = Choose the functionalities that suit your
needs, along with any deployed application plugins.
car.index.assemblyHelp.FuncCentric.title = Function Centric
-car.index.assemblyHelp.desp = Assemble a server from geronimo plugins in
the current server. Please choose from one of the following 3 modes:
+car.index.assemblyHelp.desp = Assemble a server from geronimo plugins in
the current server. Choose from one of the following 3 modes:
car.index.assemblyHelp.note = <p>Note this portlet only works with
geronimo plugins. If your application is not a geronimo plugin, you have the following options:</p><p>-
Use the "Create Plugin" portlet from console to convert your application into a geronimo plugin<br/>-
Use car-maven-plugin to convert your application into a geronimo plugin<br/>- Deploy
your application after your server is assembled<br/></p>
car.index.assemblyMode = Custom Assembly Mode:
car.index.createGeronimoPluginExp = Choose a configuration in the current Geronimo
server to export as a Geronimo plugin. The configuration will be saved as a CAR file to your
local filesystem. <i>Note: at present, you must manually add a <tt>META-INF/geronimo-plugin.xml</tt>
file to the CAR after you export it in order for it to be a valid plugin.</i>
-car.index.createPluginHelp.desp = <p>Choose a configuration in the current
Geronimo server to export as Geronimo plugin. Fill out the plugin metadata information and
save the plugin as a car file to your local file system. The console will generate the <tt>geronimo-plugin.xml</tt>
file that stores the plugin metadata information for your project and package it into a car
file. You can configure many plugin metadata via admin console, however, you will not be
able to configure some of the advanced configuration, for example the <tt>config-xml-ceontent</tt>
or <tt>config-substitution properties</tt>.</p><p>If you like to generate
a geronimo plugin from command line, you can use the car-maven-plugin to generate a <tt>geronimo-plugin.xml</tt>
file for your project, package your project as a car file, and add your project onto the geronimo
plugin catalog (<tt>geronimo-plugins.xml</tt> file) automatically.</p>
+car.index.createPluginHelp.desp = <p>Choose a configuration in the current
Geronimo server to export as Geronimo plugin. Fill out the plugin metadata information and
save the plugin as a car file to your local file system. The console will generate the <tt>geronimo-plugin.xml</tt>
file that stores the plugin metadata information for your project and package it into a car
file. You can configure many plugin metadata via admin console, however, you will not be
able to configure some of the advanced configuration, for example the <tt>config-xml-ceontent</tt>
or <tt>config-substitution</tt> properties.</p><p>If you like to generate
a geronimo plugin from command line, you can use the car-maven-plugin to generate a <tt>geronimo-plugin.xml</tt>
file for your project, package your project as a car file, and add your project onto the geronimo
plugin catalog (<tt>geronimo-plugins.xml</tt> file) automatically.</p>
car.index.createPluginHelp.title = Create geronimo plugins
-car.index.installPluginHelp.desp = <p>Install geronimo plugins from a
local or remote repository into the current Geronimo server.</p> <p>Click on the
"Update Repository List" link to update the repository list to the latest recommended by the
server.</p> <p>If you don't see your desired repository, click on the "Add Repository"
link to add additional repository of your choice. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository. </p>
+car.index.installPluginHelp.desp = <p>Install geronimo plugins from a
local or remote repository into the current Geronimo server.</p> <p>Click the
"Update Repository List" link to update the repository list to the latest recommended by the
server.</p> <p>If you don't see your desired repository, click the "Add Repository"
link to add additional repository of your choice. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository. </p>
car.index.installPluginHelp.title = Install geronimo plugins
car.index.optionalAuthentication = Optional Authentication
car.index.removePluginsExp = To remove a plugin, use the categories under
<b>Applications</b> to locate the plugin module and uninstall it.
-car.index.summary = <h2>Install Geronimo Plugins</h2>
<p>This portlet lets you install Geronimo plugins. This can be used to install new features
into a Geronimo server at runtime.</p> <p>Choose a local or remote repository
to inspect for available Geronimo plugins. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository.</p> <p>You
can also download running configurations from another Geronimo server just as if you're browsing
and installing third-party plugins. If you want to point to a remote Geronimo server, enter
a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt> and the
enter the administrator username and password in the optional authentication fields.</p>
+car.index.summary = <h2>Install Geronimo Plugins</h2>
<p>This portlet lets you install Geronimo plugins. This can be used to install new features
into a Geronimo server at runtime.</p> <p>Choose a local or remote repository
to inspect for available Geronimo plugins. The repository must have a <tt>geronimo-plugins.xml</tt>
file in the root directory listing the available plugins in the repository.</p> <p>You
can also download running configurations from another Geronimo server just as if you're browsing
and installing third-party plugins. If you want to point to a remote Geronimo server, enter
a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt> and then
enter the administrator username and password in the optional authentication fields.</p>
car.index.updateRepositoryList = Update Repository List
car.index.validateConfig = Please select a configuration to export.
car.list.PluginGroup = Plugin Groups in local server:
@@ -118,7 +118,7 @@
car.pluginParams.openSourceExp = Check this box if the license is an OSI-approved
open source license (see <a href="http://www.opensource.org/licenses/index.php">http://www.opensource.org/licenses/index.php</a>).
car.pluginParams.pluginURLExp = A URL to get more information about the plugin
(e.g. the plugin home page).
car.pluginParams.prereqDescriptionExp = A longer description of what the user needs
to do to comply with this prerequisite (for example, instructions to set up a database pool
listing the supported database products and telling the user where to find a script to initialize
the database). This should be plain text with empty lines to separate paragraphs.
-car.pluginParams.prerequisiteIDExp = The module ID of a prerequisite for this
plugin. This is a module that must be present in the server before the plugin can be installed.
It may be something like a specific web container for a web application (<tt>geronimo/jetty/*/car</tt>)
or something like a database pool or security realm that the user must install because the
plugin author can't create a value that will be valid in the destination server. You may
want to leave out as many segments of the module ID as possible in order to accommodate more
users (e.g. <tt>*/mypool/*/*</tt> rather than <tt>myapp/mypool/1.2/car</tt>).
+car.pluginParams.prerequisiteIDExp = The module ID of a prerequisite for this
plugin. This is a module that must be present in the server before the plugin can be installed.
It may be something like a specific web container for a web application (<tt>geronimo/jetty/*/car</tt>)
or something like a database pool or security realm that the user must install because the
plugin author can't create a value that will be valid in the destination server. You may
want to leave out as many segments of the module ID as possible in order to accommodate more
users ( for example, <tt>*/mypool/*/*</tt> rather than <tt>myapp/mypool/1.2/car</tt>).
car.pluginParams.prerequisiteTypeExp = A brief description of the type of prerequisite
this is (for the benefit of the user). Examples could include <tt>Database Pool</tt>
or <tt>Web Container</tt>.
car.pluginParams.title = <b>Export Plugin</b> -- Configure
Plugin Data
car.pluginParams.uniqueIDExp = The globally unique ID for this plugin.
This is determined from the installation in the server you're exporting. This defines the
version number for the plugin, so make sure it's correct.
@@ -185,8 +185,8 @@
realmwizard._sql.JDBCUrlExp = The JDBC URL that specifies
the details of the database to connect to. This has a different form for each JDBC driver.
realmwizard._sql.JDBCUsernameExp = The username used to connect
to the database
realmwizard._sql.databasePoolExp = A database pool that the login
module will use to connect to the database. If this is specified, none of the rest of the
settings after this are necessary.
-realmwizard._sql.digestAlgorithmExp = Message Digest algorithm (e.g.
MD5, SHA1, etc.) used on the passwords. Leave this field empty if no digest algorithm is
used.
-realmwizard._sql.digestEncodingExp = Encoding to use for digests
(e.g. hex, base64). This is used only if a Message Digest algorithm is specified.If no encoding
is specified, hex will be used.
+realmwizard._sql.digestAlgorithmExp = Message Digest algorithm (for
example, MD5, SHA1 and so on) used on the passwords. Leave this field empty if no digest
algorithm is used.
+realmwizard._sql.digestEncodingExp = Encoding to use for digests
(for example, hex, base64). This is used only if a Message Digest algorithm is specified.If
no encoding is specified, hex will be used.
realmwizard._sql.driverJARExp = The JAR holding the selected
JDBC driver. Should be installed under GERONIMO/repository/ to appear in this list.
realmwizard._sql.eitherPoolOrJDBC = A SQL security realm must
either have a database pool or JDBC connectivity settings to connect to the database. Please
select EITHER the database pool, OR the rest of the JDBC settings.
realmwizard._sql.groupSelectSQLExp = A SQL statement to load group
information for a user. It should return 2 columns, the first holding a username and the
second holding a group name. The statement may use the PreparedStatement syntax of ? for
a parameter, in which case the username will be set for every parameter. A typical setting
would be <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt>
or for a more normalized schema, <tt>SELECT u.username, g.name FROM app_users u,
groups g, user_groups ug WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt>
@@ -198,11 +198,11 @@
realmwizard.advanced.failuresWithin = failures within
realmwizard.advanced.failuresWithinSeconds = seconds
realmwizard.advanced.global = Global
-realmwizard.advanced.global.description = If global, security realm
name must be unique but is available to ejbs. If not global, name does not need to be unique.
In any case, realm plugin must be a parent of a web app to be visible to that app.
+realmwizard.advanced.global.description = If global, security realm
name must be unique but is available to EJBs. If not global, name does not need to be unique.
In any case, realm plugin must be a parent of a web app to be visible to that app.
realmwizard.advanced.keepAccountLockedFor = and keep the account locked
for
realmwizard.advanced.keepAccountLockedForSeconds = seconds
realmwizard.advanced.lockUserAfter = Lock a user after
-realmwizard.advanced.lockoutEnabledExp = If enabled, a certain number
of failed logins in a particular time frame will cause a user's account to be locked for a
certain period of time. This is a defense against brute force account cracking attacks.
+realmwizard.advanced.lockoutEnabledExp = If enabled, a certain number
of failed logins in a particular time frame will cause a user's account to be locked for a
certain period of time. This is a defence against brute force account cracking attacks.
realmwizard.advanced.namedCredential = Named Credential
realmwizard.advanced.storePasswordEnabledExp = If enabled, the realm will
store each user's password in a private credential in the Subject. This will allow access
to the password later after the login process has completed. This is not normally required.
realmwizard.advanced.title = <b>Create Security Realm</b>
-- Step 3: Advanced Configuration
@@ -253,7 +253,7 @@
realmwizard.configure.certprops.groupsURI.name = Groups File URI
realmwizard.configure.certprops.usersURI.description = The location of a properties
file (relative to the Geronimo home dir) holding certificate to user mapping information.
The format of each line should be <tt>username=certificatename</tt> where certificate
name is <tt>X509Certificate.getSubjectX500Principal().getName()</tt>
realmwizard.configure.certprops.usersURI.name = Users File URI
-realmwizard.configure.ldap.authentication.description = The security level to use,
which can be <tt>none</tt>, <tt>simple</tt>, or <tt>strong</tt>
(the usual value is <tt>simple</tt>. If this property is unspecified, the behavior
is determined by the service provider.
+realmwizard.configure.ldap.authentication.description = The security level to use,
which can be <tt>none</tt>, <tt>simple</tt>, or <tt>strong</tt>
(the usual value is <tt>simple</tt>. If this property is unspecified, the behaviour
is determined by the service provider.
realmwizard.configure.ldap.authentication.name = Authentication
realmwizard.configure.ldap.connectionPassword.description = The password used to connect
to the LDAP server.
realmwizard.configure.ldap.connectionPassword.name = Connect Password
@@ -261,7 +261,7 @@
realmwizard.configure.ldap.connectionProtocol.name = Connect Protocol
realmwizard.configure.ldap.connectionURL.description = A URL that describes how to
connect to the LDAP server. Normally this would be <tt>ldap://ldap-server-hostname:389</tt>
(or for the Apache directory server included with Geronimo, <tt>ldap://localhost:1389</tt>).
realmwizard.configure.ldap.connectionURL.name = Connection URL
-realmwizard.configure.ldap.connectionUsername.description = The user name used to connect
to the LDAP server. Should be an administrator or Directory manager that has access to examine
other users' passwords.
+realmwizard.configure.ldap.connectionUsername.description = The username used to connect
to the LDAP server. Should be an administrator or Directory manager that has access to examine
other users' passwords.
realmwizard.configure.ldap.connectionUsername.name = Connect Username
realmwizard.configure.ldap.initialContextFactory.description = The fully-qualified class
name of the initial context factory. If you don't know what to use here, you should use <tt>com.sun.jndi.ldap.LdapCtxFactory</tt>.
realmwizard.configure.ldap.initialContextFactory.name = Initial Context Factory
@@ -281,9 +281,9 @@
realmwizard.configure.ldap.userSearchMatching.name = User Search Matching
realmwizard.configure.ldap.userSearchSubtree.description = If set to <tt>true</tt>,
then subtrees under the "User Base" will be searched for users too. If set to <tt>false</tt>,
then only the "User Base" location itself will be searched.
realmwizard.configure.ldap.userSearchSubtree.name = User Search Subtree
-realmwizard.configure.props.digest.description = Message Digest algorithm (e.g.
MD5, SHA1, etc.) used on the passwords. Leave this field empty if no digest algorithm is
used.
+realmwizard.configure.props.digest.description = Message Digest algorithm (for
example, MD5, SHA1 and so on) used on the passwords. Leave this field empty if no digest
algorithm is used.
realmwizard.configure.props.digest.name = Digest Algorithm
-realmwizard.configure.props.encoding.description = Encoding to use for digests
(e.g. hex, base64). This is used only if a Message Digest algorithm is specified. If no
encoding is specified, hex will be used.
+realmwizard.configure.props.encoding.description = Encoding to use for digests
(for example, hex, base64). This is used only if a Message Digest algorithm is specified.
If no encoding is specified, hex will be used.
realmwizard.configure.props.encoding.name = Digest Encoding
realmwizard.configure.props.groupsURI.description = The location of a properties
file (relative to the Geronimo home dir) holding group information. The format of each line
should be <tt>group=user,user,...</tt>.
realmwizard.configure.props.groupsURI.name = Groups File URI
Author: gawor
Date: Mon Dec 7 05:44:43 2009
New Revision: 887839
URL: http://svn.apache.org/viewvc?rev=887839&view=rev
Log:
start config bundle in transient way
Modified:
geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=887839&r1=887838&r2=887839&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
Mon Dec 7 05:44:43 2009
@@ -54,6 +54,7 @@
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.osgi.BundleUtils;
import org.apache.geronimo.kernel.osgi.ConfigurationActivator;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -210,7 +211,9 @@
createTempPluginMetadata();
String location = "reference:file:" + baseDir.getAbsolutePath();
Bundle bundle = this.bundleContext.installBundle(location);
- bundle.start();
+ if (BundleUtils.canStart(bundle)) {
+ bundle.start(Bundle.START_TRANSIENT);
+ }
configurationData.setBundleContext(bundle.getBundleContext());
configurationManager.loadConfiguration(configurationData);
return configurationManager.getConfiguration(environment.getConfigId());
Author: gawor
Date: Mon Dec 7 02:30:32 2009
New Revision: 887824
URL: http://svn.apache.org/viewvc?rev=887824&view=rev
Log:
tie down maven-antrun-plugin and add parent element to karaf-client bundle to fix weird build
issues related to maven-antrun-plugin
Modified:
geronimo/server/trunk/framework/bundles/karaf-client/pom.xml
geronimo/server/trunk/framework/bundles/pom.xml
geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
geronimo/server/trunk/framework/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/bundles/karaf-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/karaf-client/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/karaf-client/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/karaf-client/pom.xml Mon Dec 7 02:30:32 2009
@@ -21,8 +21,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>karaf-client</artifactId>
<packaging>jar</packaging>
Modified: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/pom.xml Mon Dec 7 02:30:32 2009
@@ -50,7 +50,6 @@
<module>httpcore</module>
<module>karaf-client</module>
<!-- todo remove -->
- <module>log4j</module>
<module>sxc-jaxb</module>
<module>sxc-runtime</module>
<module>wadi-aop</module>
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Mon Dec 7 02:30:32 2009
@@ -161,14 +161,6 @@
</configuration>
</execution>
</executions>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Mon Dec 7 02:30:32 2009
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>provided</scope>
</dependency>
@@ -155,14 +155,6 @@
</configuration>
</execution>
</executions>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Mon Dec 7 02:30:32 2009
@@ -169,11 +169,6 @@
<!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15_1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-jaxb</artifactId>
<version>0.7.2_1-SNAPSHOT</version>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=887824&r1=887823&r2=887824&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Dec 7 02:30:32 2009
@@ -2181,6 +2181,21 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+
<!-- INTERNAL -->
<plugin>
Author: gawor
Date: Mon Dec 7 01:43:28 2009
New Revision: 887816
URL: http://svn.apache.org/viewvc?rev=887816&view=rev
Log:
some jars don't have manifest file
Modified:
geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java
Modified: geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java?rev=887816&r1=887815&r2=887816&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/FileUtils.java
Mon Dec 7 01:43:28 2009
@@ -29,17 +29,16 @@
* @version $Rev$ $Date$
*/
public class FileUtils {
+
/**
- * Determine whether a file is a JAR File.
+ * Determine whether a file is a JAR File.
+ *
+ * Note: Jar file is a zip file with an *optional* META-INF directory.
+ * Therefore, there is no reliable way to check if a file is a Jar file.
+ * So this functions returns the same as calling isZipFile(File).
*/
public static boolean isJarFile(File file) throws IOException {
- if(!isZipFile(file)) {
- return false;
- }
- ZipFile zip = new ZipFile(file);
- boolean manifest = zip.getEntry("META-INF/MANIFEST.MF") != null;
- zip.close();
- return manifest;
+ return isZipFile(file);
}
/**
Author: gawor
Date: Mon Dec 7 01:06:06 2009
New Revision: 887814
URL: http://svn.apache.org/viewvc?rev=887814&view=rev
Log:
GERONIMO-4971: install application bundles into the repository
Removed:
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModule.java
Modified:
geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
Modified: geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml?rev=887814&r1=887813&r2=887814&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Mon Dec 7 01:06:06 2009
@@ -36,8 +36,8 @@
<dependencies>
<!-- parent -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-system</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=887814&r1=887813&r2=887814&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Mon
Dec 7 01:06:06 2009
@@ -12,8 +12,38 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-jaspi</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-security</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-system</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -21,4 +51,109 @@
<artifactId>geronimo-aries-builder</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-jee_5</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jacc_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml?rev=887814&r1=887813&r2=887814&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml Mon Dec 7 01:06:06
2009
@@ -19,6 +19,9 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<gbean name="AriesAppBuilder" class="org.apache.geronimo.aries.builder.AriesAppConfigBuilder">
+ <reference name="Repository">
+ <name>Repository</name>
+ </reference>
</gbean>
</module>
Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java?rev=887814&r1=887813&r2=887814&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
Mon Dec 7 01:06:06 2009
@@ -19,11 +19,9 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
@@ -52,12 +50,12 @@
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.osgi.BundleUtils;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.ArtifactResolver;
+import org.apache.geronimo.kernel.repository.Dependency;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.osgi.framework.Bundle;
+import org.apache.geronimo.kernel.repository.ImportType;
+import org.apache.geronimo.kernel.repository.WritableListableRepository;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
@@ -74,14 +72,14 @@
private Kernel kernel;
private BundleContext bundleContext;
- private Collection<Repository> repositories;
+ private WritableListableRepository repository;
private ConfigurationManager configurationManager;
- public AriesAppConfigBuilder(@ParamReference(name="Repository", namingType = "Repository")Collection<Repository>
repositories,
+ public AriesAppConfigBuilder(@ParamReference(name="Repository", namingType = "Repository")WritableListableRepository
repository,
@ParamSpecial(type = SpecialAttributeType.kernel) Kernel
kernel,
@ParamSpecial(type = SpecialAttributeType.bundleContext)
BundleContext bundleContext)
throws GBeanNotFoundException {
- this.repositories = repositories;
+ this.repository = repository;
this.kernel = kernel;
this.bundleContext = bundleContext;
this.configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
@@ -96,22 +94,11 @@
public void doFail() {
doStop();
}
-
-
-
- /*
- LOG.debug("Found Aries Application: {}", appMetadata.getApplicationName());
-
- Environment env = new Environment();
- env.setConfigId(new Artifact("aries", appMetadata.getApplicationSymbolicName(), appMetadata.getApplicationVersion().toString(),
"jar"));
-
- AbstractName moduleName = naming.createRootName(env.getConfigId(), NameFactory.NULL,
NameFactory.J2EE_APPLICATION);
-
- AriesAppModule module = new AriesAppModule(moduleName, env, moduleFile, targetPath,
appMetadata);
- */
-
-
+ private WritableListableRepository getRepository() {
+ return repository;
+ }
+
private ApplicationMetadataManager getApplicationMetadataManager() {
ServiceReference ref =
bundleContext.getServiceReference(ApplicationMetadataManager.class.getName());
@@ -130,12 +117,30 @@
return name;
}
- public void installModule(JarFile jarFile, ApplicationMetadata appMetadata) throws DeploymentException
{
+ private String getBundleVersion(Manifest mf) {
+ String version = null;
+ if (mf != null) {
+ version = (String) mf.getMainAttributes().getValue(Constants.BUNDLE_VERSION);
+ }
+ return version;
+ }
+
+ private static class AppEntry {
+ String entryName;
+ Manifest manifest;
+
+ public AppEntry(String entryName, Manifest manifest) {
+ this.entryName = entryName;
+ this.manifest = manifest;
+ }
+ }
+
+ public void install(JarFile jarFile, ApplicationMetadata appMetadata, Environment environment)
throws DeploymentException {
/*
* XXX: This is totally not right but for now allows us to install
* simple Aries applications into Geronimo.
*/
- HashMap<String, String> mapping = new HashMap<String, String>();
+ HashMap<String, AppEntry> mapping = new HashMap<String, AppEntry>();
Enumeration<JarEntry> entries = jarFile.entries();
while(entries.hasMoreElements()) {
JarEntry entry = entries.nextElement();
@@ -145,7 +150,7 @@
JarInputStream jarInput = new JarInputStream(in);
String name = getSymbolicName(jarInput.getManifest());
if (name != null) {
- mapping.put(name, entry.getName());
+ mapping.put(name, new AppEntry(entry.getName(), jarInput.getManifest()));
}
} catch (IOException e) {
LOG.warn("Error getting jar entry {}", entry.getName(), e);
@@ -153,30 +158,29 @@
}
}
- List<Bundle> installedBundles = new ArrayList<Bundle>();
try {
for (Content content : appMetadata.getApplicationContents()) {
- String entryName = mapping.get(content.getContentName());
- if (entryName == null) {
+ AppEntry appEntry = mapping.get(content.getContentName());
+ if (appEntry == null) {
LOG.warn("Unknown bundle name in application context {}", content.getContentName());
continue;
}
- ZipEntry entry = jarFile.getEntry(entryName);
+ ZipEntry entry = jarFile.getEntry(appEntry.entryName);
if (entry == null) {
// this should not happen
- throw new DeploymentException("Jar entry not found " + entryName);
+ throw new DeploymentException("Jar entry not found " + appEntry.entryName);
}
+ Artifact artifact = new Artifact("aries-app",
+ content.getContentName(),
+ getBundleVersion(appEntry.manifest),
+ "jar");
InputStream in = jarFile.getInputStream(entry);
- Bundle appBundle = bundleContext.installBundle(content.getContentName(),
in);
- installedBundles.add(appBundle);
+ getRepository().copyToRepository(in, (int) entry.getSize(), artifact, null);
+
+ environment.addDependency(new Dependency(artifact, ImportType.ALL));
}
- for (Bundle installedBundle : installedBundles) {
- if (BundleUtils.canStart(installedBundle)) {
- installedBundle.start();
- }
- }
} catch (Exception e) {
throw new DeploymentException("Failed to install application", e);
}
@@ -219,7 +223,7 @@
throws IOException, DeploymentException {
ApplicationMetadata appMetadata = (ApplicationMetadata) plan;
- Artifact name = new Artifact("aries", appMetadata.getApplicationSymbolicName(), appMetadata.getApplicationVersion().toString(),
"eba");
+ Artifact name = new Artifact("aries-app", appMetadata.getApplicationSymbolicName(),
appMetadata.getApplicationVersion().toString(), "eba");
return name;
}
@@ -233,7 +237,11 @@
ConfigurationStore targetConfigurationStore)
throws IOException, DeploymentException {
ApplicationMetadata appMetadata = (ApplicationMetadata) plan;
- installModule(jarFile, appMetadata);
+
+ Environment environment = new Environment();
+ environment.setConfigId(configId);
+
+ install(jarFile, appMetadata, environment);
File outfile;
try {
@@ -242,9 +250,6 @@
throw new DeploymentException(e);
}
- Environment environment = new Environment();
- environment.setConfigId(configId);
-
Naming naming = kernel.getNaming();
AbstractName moduleName = naming.createRootName(configId, configId.toString(), "AriesApplication");
try {
@@ -255,7 +260,7 @@
ConfigurationModuleType.SERVICE,
naming,
configurationManager,
- repositories,
+ null,
bundleContext);
@@ -269,6 +274,8 @@
} catch (IOException e) {
e.printStackTrace();
throw e;
+ } finally {
+ try { jarFile.close(); } catch (IOException ignore) {}
}
}
Geronimo Revision: 887743 built with tests included See the full build-1400.log file at http://people.apache.org/builds/geronimo/server/binaries/2.2/20091206/build-1400.log Download the binaries from http://people.apache.org/builds/geronimo/server/binaries/2.2/20091206 [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 23 minutes 23 seconds [INFO] Finished at: Sun Dec 06 15:17:46 EST 2009 [INFO] Final Memory: 309M/950M [INFO] ------------------------------------------------------------------------ TESTSUITE RESULTS (Failures only) ================================= Assembly: tomcat ================================= See full test results and logs at http://people.apache.org/builds/geronimo/server/binaries/2.2/20091206/logs-1400-tomcat/ Assembly: jetty ================================= See full test results and logs at http://people.apache.org/builds/geronimo/server/binaries/2.2/20091206/logs-1400-jetty/ Samples: branches/2.2 ================================= Log: http://people.apache.org/builds/geronimo/server/binaries/2.2/20091206/samples-1400.log Build status: FAILED
Author: gawor
Date: Sun Dec 6 05:23:37 2009
New Revision: 887639
URL: http://svn.apache.org/viewvc?rev=887639&view=rev
Log:
GERONIMO-4971: switch to ConfigurationBuilder instead of ModuleBuilder
Added:
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
(contents, props changed)
- copied, changed from r887632, geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
Removed:
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
Modified:
geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml
Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml?rev=887639&r1=887638&r2=887639&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml Sun Dec 6 05:23:37
2009
@@ -18,7 +18,7 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="AriesAppBuilder" class="org.apache.geronimo.aries.builder.AriesAppModuleBuilder">
+ <gbean name="AriesAppBuilder" class="org.apache.geronimo.aries.builder.AriesAppConfigBuilder">
</gbean>
</module>
Copied: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
(from r887632, geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java?p2=geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java&p1=geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java&r1=887632&r2=887639&rev=887639&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
Sun Dec 6 05:23:37 2009
@@ -19,8 +19,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
@@ -36,23 +34,31 @@
import org.apache.aries.application.ApplicationMetadataManager;
import org.apache.aries.application.Content;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.ConfigurationBuilder;
+import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamReference;
import org.apache.geronimo.gbean.annotation.ParamSpecial;
import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
-import org.apache.geronimo.j2ee.deployment.EARContext;
-import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
import org.apache.geronimo.kernel.osgi.BundleUtils;
import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.ArtifactResolver;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.kernel.repository.Repository;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
@@ -61,18 +67,24 @@
/**
* @version $Rev:385232 $ $Date$
*/
-@GBean(j2eeType = NameFactory.MODULE_BUILDER)
-public class AriesAppModuleBuilder implements ModuleBuilder, GBeanLifecycle {
+@GBean(j2eeType = "ConfigBuilder")
+public class AriesAppConfigBuilder implements ConfigurationBuilder, GBeanLifecycle {
- private static final Logger LOG = LoggerFactory.getLogger(AriesAppModuleBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AriesAppConfigBuilder.class);
private Kernel kernel;
- private Bundle bundle;
-
- public AriesAppModuleBuilder(@ParamSpecial(type = SpecialAttributeType.kernel) Kernel
kernel,
- @ParamSpecial(type = SpecialAttributeType.bundle) Bundle
bundle) {
+ private BundleContext bundleContext;
+ private Collection<Repository> repositories;
+ private ConfigurationManager configurationManager;
+
+ public AriesAppConfigBuilder(@ParamReference(name="Repository", namingType = "Repository")Collection<Repository>
repositories,
+ @ParamSpecial(type = SpecialAttributeType.kernel) Kernel
kernel,
+ @ParamSpecial(type = SpecialAttributeType.bundleContext)
BundleContext bundleContext)
+ throws GBeanNotFoundException {
+ this.repositories = repositories;
this.kernel = kernel;
- this.bundle = bundle;
+ this.bundleContext = bundleContext;
+ this.configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
}
public void doStart() throws Exception {
@@ -85,39 +97,9 @@
doStop();
}
- public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder
idBuilder) throws DeploymentException {
- return createModule(plan, moduleFile, "aries-application", null, null, null, naming,
idBuilder);
- }
+
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl,
Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder
idBuilder) throws DeploymentException {
- return createModule(plan, moduleFile, targetPath, specDDUrl, environment, earName,
naming, idBuilder);
- }
-
- private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl,
Environment earEnvironment, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder)
throws DeploymentException {
-
- JarEntry appManifest = moduleFile.getJarEntry("META-INF/APPLICATION.MF");
-
- if (appManifest == null) {
- return null;
- }
-
- ApplicationMetadataManager service = getApplicationMetadataManager();
- if (service == null) {
- return null;
- }
-
- ApplicationMetadata appMetadata = null;
- try {
- InputStream in = moduleFile.getInputStream(appManifest);
- appMetadata = service.parseApplication(in);
- } catch (IOException e) {
- throw new DeploymentException("Failed to parse application metadata", e);
- }
-
- if (appMetadata == null) {
- return null;
- }
-
+ /*
LOG.debug("Found Aries Application: {}", appMetadata.getApplicationName());
Environment env = new Environment();
@@ -126,15 +108,15 @@
AbstractName moduleName = naming.createRootName(env.getConfigId(), NameFactory.NULL,
NameFactory.J2EE_APPLICATION);
AriesAppModule module = new AriesAppModule(moduleName, env, moduleFile, targetPath,
appMetadata);
-
- return module;
- }
+ */
+
+
private ApplicationMetadataManager getApplicationMetadataManager() {
ServiceReference ref =
- bundle.getBundleContext().getServiceReference(ApplicationMetadataManager.class.getName());
+ bundleContext.getServiceReference(ApplicationMetadataManager.class.getName());
if (ref != null) {
- return (ApplicationMetadataManager) bundle.getBundleContext().getService(ref);
+ return (ApplicationMetadataManager) bundleContext.getService(ref);
} else {
return null;
}
@@ -148,21 +130,18 @@
return name;
}
- public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories)
throws DeploymentException {
- AriesAppModule ariesModule = (AriesAppModule) module;
- JarFile moduleFile = module.getModuleFile();
-
+ public void installModule(JarFile jarFile, ApplicationMetadata appMetadata) throws DeploymentException
{
/*
* XXX: This is totally not right but for now allows us to install
* simple Aries applications into Geronimo.
*/
HashMap<String, String> mapping = new HashMap<String, String>();
- Enumeration<JarEntry> entries = moduleFile.entries();
+ Enumeration<JarEntry> entries = jarFile.entries();
while(entries.hasMoreElements()) {
JarEntry entry = entries.nextElement();
if (entry.getName().endsWith(".jar")) {
try {
- InputStream in = moduleFile.getInputStream(entry);
+ InputStream in = jarFile.getInputStream(entry);
JarInputStream jarInput = new JarInputStream(in);
String name = getSymbolicName(jarInput.getManifest());
if (name != null) {
@@ -176,20 +155,20 @@
List<Bundle> installedBundles = new ArrayList<Bundle>();
try {
- for (Content content : ariesModule.getApplicationMetadata().getApplicationContents())
{
+ for (Content content : appMetadata.getApplicationContents()) {
String entryName = mapping.get(content.getContentName());
if (entryName == null) {
LOG.warn("Unknown bundle name in application context {}", content.getContentName());
continue;
}
- ZipEntry entry = moduleFile.getEntry(entryName);
+ ZipEntry entry = jarFile.getEntry(entryName);
if (entry == null) {
// this should not happen
throw new DeploymentException("Jar entry not found " + entryName);
}
- InputStream in = moduleFile.getInputStream(entry);
- Bundle appBundle = bundle.getBundleContext().installBundle(content.getContentName(),
in);
+ InputStream in = jarFile.getInputStream(entry);
+ Bundle appBundle = bundleContext.installBundle(content.getContentName(),
in);
installedBundles.add(appBundle);
}
@@ -200,20 +179,97 @@
}
} catch (Exception e) {
throw new DeploymentException("Failed to install application", e);
- }
-
- module.setEarContext(earContext);
- module.setRootEarContext(earContext);
+ }
}
- public void initContext(EARContext earContext, Module clientModule, Bundle bundle) throws
DeploymentException {
- }
- public void addGBeans(EARContext earContext, Module module, Bundle earBundle, Collection
repositories) throws DeploymentException {
+ public Object getDeploymentPlan(File planFile,
+ JarFile jarFile,
+ ModuleIDBuilder idBuilder)
+ throws DeploymentException {
+ if (planFile == null && jarFile == null) {
+ return null;
+ }
+
+ JarEntry appManifest = jarFile.getJarEntry("META-INF/APPLICATION.MF");
+
+ if (appManifest == null) {
+ return null;
+ }
+
+ ApplicationMetadataManager service = getApplicationMetadataManager();
+ if (service == null) {
+ return null;
+ }
+
+ ApplicationMetadata appMetadata = null;
+ try {
+ InputStream in = jarFile.getInputStream(appManifest);
+ appMetadata = service.parseApplication(in);
+ } catch (IOException e) {
+ throw new DeploymentException("Failed to parse application metadata", e);
+ }
+
+ return appMetadata;
}
-
- public String getSchemaNamespace() {
- return null;
+
+ public Artifact getConfigurationID(Object plan,
+ JarFile jarFile,
+ ModuleIDBuilder idBuilder)
+ throws IOException, DeploymentException {
+ ApplicationMetadata appMetadata = (ApplicationMetadata) plan;
+
+ Artifact name = new Artifact("aries", appMetadata.getApplicationSymbolicName(), appMetadata.getApplicationVersion().toString(),
"eba");
+
+ return name;
+ }
+
+ public DeploymentContext buildConfiguration(boolean inPlaceDeployment,
+ Artifact configId,
+ Object plan,
+ JarFile jarFile,
+ Collection<ConfigurationStore> configurationStores,
+ ArtifactResolver artifactResolver,
+ ConfigurationStore targetConfigurationStore)
+ throws IOException, DeploymentException {
+ ApplicationMetadata appMetadata = (ApplicationMetadata) plan;
+ installModule(jarFile, appMetadata);
+
+ File outfile;
+ try {
+ outfile = targetConfigurationStore.createNewConfigurationDir(configId);
+ } catch (ConfigurationAlreadyExistsException e) {
+ throw new DeploymentException(e);
+ }
+
+ Environment environment = new Environment();
+ environment.setConfigId(configId);
+
+ Naming naming = kernel.getNaming();
+ AbstractName moduleName = naming.createRootName(configId, configId.toString(), "AriesApplication");
+ try {
+ DeploymentContext context = new DeploymentContext(outfile,
+ inPlaceDeployment && null != jarFile ? DeploymentUtil.toFile(jarFile)
: null,
+ environment,
+ moduleName,
+ ConfigurationModuleType.SERVICE,
+ naming,
+ configurationManager,
+ repositories,
+ bundleContext);
+
+
+ context.flush();
+ context.initializeConfiguration();
+
+ return context;
+ } catch (DeploymentException e) {
+ e.printStackTrace();
+ throw e;
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw e;
+ }
}
}
Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppConfigBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Author: gawor
Date: Sun Dec 6 03:45:29 2009
New Revision: 887632
URL: http://svn.apache.org/viewvc?rev=887632&view=rev
Log:
revert r887507 - will take a different route
Added:
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
- copied unchanged from r887506, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
Modified:
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
Sun Dec 6 03:45:29 2009
@@ -216,11 +216,4 @@
return null;
}
- public int getPriority() {
- return 50;
- }
-
- public boolean supportsModule(Class moduleType) {
- return AriesAppModule.class.isAssignableFrom(moduleType);
- }
}
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Sun Dec 6 03:45:29 2009
@@ -839,14 +839,6 @@
return GERAPPCLIENT_NAMESPACE;
}
- public int getPriority() {
- return 40;
- }
-
- public boolean supportsModule(Class moduleType) {
- return AppClientModule.class.isAssignableFrom(moduleType);
- }
-
public void addManifestClassPath(DeploymentContext deploymentContext, JarFile earFile,
JarFile jarFile, URI jarFileLocation) throws DeploymentException {
Manifest manifest;
try {
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Sun Dec 6 03:45:29 2009
@@ -537,14 +537,6 @@
return GERCONNECTOR_NAMESPACE;
}
- public int getPriority() {
- return 30;
- }
-
- public boolean supportsModule(Class moduleType) {
- return ConnectorModule.class.isAssignableFrom(moduleType);
- }
-
private void addConnectorGBeans(EARContext earContext, AbstractName jcaResourceName,
GBeanData resourceAdapterModuleData, ConnectorType connector, GerConnectorType geronimoConnector,
Bundle bundle) throws DeploymentException {
ResourceadapterType resourceadapter = connector.getResourceadapter();
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Sun Dec 6 03:45:29 2009
@@ -22,7 +22,6 @@
import java.net.URL;
import java.sql.Connection;
import java.sql.Statement;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -30,6 +29,7 @@
import java.util.HashMap;
import java.util.jar.JarFile;
+import javax.naming.Reference;
import javax.sql.DataSource;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.DeploymentContext;
@@ -41,6 +41,7 @@
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
@@ -89,6 +90,22 @@
private Environment defaultEnvironment;
private ConfigurationStore configurationStore = new MockConfigStore();
private MockRepository repository;
+
+ private ActivationSpecInfoLocator activationSpecInfoLocator = new ActivationSpecInfoLocator()
{
+
+ public Reference createResourceRef(AbstractNameQuery containerId, Class iface, Configuration
configuration) {
+ return null;
+ }
+
+ public Reference createAdminObjectRef(AbstractNameQuery containerId, Class iface,
Configuration configuration) {
+ return null;
+ }
+
+ public GBeanData locateActivationSpecInfo(AbstractNameQuery nameQuery, String messageListenerInterface,
Configuration configuration) {
+ return null;
+ }
+ };
+
private Kernel kernel;
private ConfigurationManager configurationManager;
private static final Naming naming = new Jsr77Naming();
@@ -105,15 +122,17 @@
rarFile = DeploymentUtil.createJarFile(new File(BASEDIR, "target/test-ear-noger.ear"));
GBeanBuilder serviceBuilder = new GBeanBuilder(null, null);
// EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment, transactionContextManagerName,
connectionTrackerName, null, null, null, new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()),
null, null, ejbReferenceBuilder, null,
- List<ModuleBuilder> builders = new ArrayList<ModuleBuilder>();
- builders.add(new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize,
defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching,
defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(serviceBuilder)));
EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment,
transactionManagerName,
connectionTrackerName,
null,
new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()),
Collections.singleton(repository),
- builders,
+ null,
+ null,
+ new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize,
defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching,
defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(serviceBuilder)),
+ activationSpecInfoLocator,
+ null,
serviceBuilder,
null,
kernel.getNaming(),
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Sun Dec 6 03:45:29 2009
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
@@ -61,6 +60,7 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.ReferencePatterns;
+import org.apache.geronimo.gbean.SingleElementCollection;
import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamAttribute;
import org.apache.geronimo.gbean.annotation.ParamReference;
@@ -123,7 +123,11 @@
private final ConfigurationManager configurationManager;
private final Collection<? extends Repository> repositories;
- private final Collection<ModuleBuilder> moduleBuilders;
+ private final SingleElementCollection ejbConfigBuilder;
+ private final SingleElementCollection webConfigBuilder;
+ private final SingleElementCollection connectorConfigBuilder;
+ private final SingleElementCollection appClientConfigBuilder;
+ private final SingleElementCollection resourceReferenceBuilder;
private final NamespaceDrivenBuilderCollection serviceBuilders;
private final Collection<ModuleBuilderExtension> persistenceUnitBuilders;
@@ -150,13 +154,57 @@
}
};
+// static {
+// GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(EARConfigBuilder.class,
NameFactory.CONFIG_BUILDER);
+// infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+// infoBuilder.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class,
true);
+// infoBuilder.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class,
true);
+// infoBuilder.addAttribute("corbaGBeanAbstractName", AbstractNameQuery.class, true);
+// infoBuilder.addAttribute("serverName", AbstractNameQuery.class, true);
+//
+// infoBuilder.addReference("Repositories", Repository.class, "Repository");
+// infoBuilder.addReference("EJBConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+// infoBuilder.addReference("WebConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+// infoBuilder.addReference("ConnectorConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+// infoBuilder.addReference("ActivationSpecInfoLocator", ActivationSpecInfoLocator.class,
NameFactory.MODULE_BUILDER);
+// infoBuilder.addReference("AppClientConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+// infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
+// infoBuilder.addReference("PersistenceUnitBuilders", ModuleBuilderExtension.class,
NameFactory.MODULE_BUILDER);
+// infoBuilder.addReference("ArtifactResolvers", ArtifactResolver.class, "ArtifactResolver");
+//
+// infoBuilder.addAttribute("kernel", Kernel.class, false);
+//
+// infoBuilder.setConstructor(new String[]{
+// "defaultEnvironment",
+// "transactionManagerAbstractName",
+// "connectionTrackerAbstractName",
+// "corbaGBeanAbstractName",
+// "serverName",
+// "Repositories",
+// "EJBConfigBuilder",
+// "WebConfigBuilder",
+// "ConnectorConfigBuilder",
+// "ActivationSpecInfoLocator",
+// "AppClientConfigBuilder",
+// "ServiceBuilders",
+// "PersistenceUnitBuilders",
+// "ArtifactResolvers",
+// "kernel"
+// });
+//
+// }
+
public EARConfigBuilder(@ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
@ParamAttribute(name = "transactionManagerAbstractName") AbstractNameQuery
transactionManagerAbstractName,
@ParamAttribute(name = "connectionTrackerAbstractName") AbstractNameQuery
connectionTrackerAbstractName,
@ParamAttribute(name = "corbaGBeanAbstractName") AbstractNameQuery
corbaGBeanAbstractName,
@ParamAttribute(name = "serverName") AbstractNameQuery serverName,
@ParamReference(name = "Repositories", namingType = "Repository")Collection<?
extends Repository> repositories,
- @ParamReference(name = "ModuleBuilders", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder>
moduleBuilders,
+ @ParamReference(name = "EJBConfigBuilder", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder>
ejbConfigBuilder,
+ @ParamReference(name = "WebConfigBuilder", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder>
webConfigBuilder,
+ @ParamReference(name = "ConnectorConfigBuilder", namingType =
NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> connectorConfigBuilder,
+ @ParamReference(name = "ActivationSpecInfoLocator", namingType
= NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> resourceReferenceBuilder,
+ @ParamReference(name = "AppClientConfigBuilder", namingType =
NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> appClientConfigBuilder,
@ParamReference(name = "ServiceBuilders", namingType = NameFactory.MODULE_BUILDER)Collection<NamespaceDrivenBuilder>
serviceBuilders,
@ParamReference(name = "PersistenceUnitBuilders", namingType
= NameFactory.MODULE_BUILDER)Collection<ModuleBuilderExtension> persistenceUnitBuilders,
@ParamReference(name = "ArtifactResolvers", namingType = "ArtifactResolver")Collection<?
extends ArtifactResolver> artifactResolvers,
@@ -169,7 +217,11 @@
serverName,
ConfigurationUtil.getConfigurationManager(kernel),
repositories,
- moduleBuilders,
+ new SingleElementCollection<ModuleBuilder>(ejbConfigBuilder),
+ new SingleElementCollection<ModuleBuilder>(webConfigBuilder),
+ new SingleElementCollection<ModuleBuilder>(connectorConfigBuilder),
+ new SingleElementCollection<ModuleBuilder>(resourceReferenceBuilder),
+ new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
serviceBuilders,
persistenceUnitBuilders,
kernel.getNaming(), artifactResolvers,
@@ -182,7 +234,11 @@
AbstractNameQuery corbaGBeanAbstractName,
AbstractNameQuery serverName,
Collection<? extends Repository> repositories,
- Collection<ModuleBuilder> moduleBuilders,
+ ModuleBuilder ejbConfigBuilder,
+ ModuleBuilder webConfigBuilder,
+ ModuleBuilder connectorConfigBuilder,
+ ActivationSpecInfoLocator activationSpecInfoLocator,
+ ModuleBuilder appClientConfigBuilder,
NamespaceDrivenBuilder serviceBuilder,
ModuleBuilderExtension persistenceUnitBuilder,
Naming naming,
@@ -194,7 +250,11 @@
serverName,
null,
repositories,
- moduleBuilders,
+ new SingleElementCollection<ModuleBuilder>(ejbConfigBuilder),
+ new SingleElementCollection<ModuleBuilder>(webConfigBuilder),
+ new SingleElementCollection<ModuleBuilder>(connectorConfigBuilder),
+ new SingleElementCollection<ActivationSpecInfoLocator>(activationSpecInfoLocator),
+ new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
serviceBuilder == null ? Collections.<NamespaceDrivenBuilder>emptySet()
: Collections.singleton(serviceBuilder),
persistenceUnitBuilder == null ? Collections.<ModuleBuilderExtension>emptySet()
: Collections.singleton(persistenceUnitBuilder),
naming,
@@ -209,7 +269,11 @@
AbstractNameQuery serverName,
ConfigurationManager configurationManager,
Collection<? extends Repository> repositories,
- Collection<ModuleBuilder> moduleBuilders,
+ SingleElementCollection ejbConfigBuilder,
+ SingleElementCollection webConfigBuilder,
+ SingleElementCollection connectorConfigBuilder,
+ SingleElementCollection resourceReferenceBuilder,
+ SingleElementCollection appClientConfigBuilder,
Collection<NamespaceDrivenBuilder> serviceBuilders,
Collection<ModuleBuilderExtension> persistenceUnitBuilders,
Naming naming,
@@ -219,7 +283,11 @@
this.repositories = repositories;
this.defaultEnvironment = defaultEnvironment;
- this.moduleBuilders = moduleBuilders;
+ this.ejbConfigBuilder = ejbConfigBuilder;
+ this.resourceReferenceBuilder = resourceReferenceBuilder;
+ this.webConfigBuilder = webConfigBuilder;
+ this.connectorConfigBuilder = connectorConfigBuilder;
+ this.appClientConfigBuilder = appClientConfigBuilder;
this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
this.persistenceUnitBuilders = persistenceUnitBuilders;
@@ -247,21 +315,21 @@
public AbstractNameQuery getCorbaGBeanName() {
return corbaGBeanObjectName;
}
-
+
private ModuleBuilder getEjbConfigBuilder() {
- return getModuleBuilder(EJBModule.class);
+ return (ModuleBuilder) ejbConfigBuilder.getElement();
}
-
+
private ModuleBuilder getWebConfigBuilder() {
- return getModuleBuilder(WebModule.class);
+ return (ModuleBuilder) webConfigBuilder.getElement();
}
-
+
private ModuleBuilder getConnectorConfigBuilder() {
- return getModuleBuilder(ConnectorModule.class);
+ return (ModuleBuilder) connectorConfigBuilder.getElement();
}
-
+
private ModuleBuilder getAppClientConfigBuilder() {
- return getModuleBuilder(AppClientModule.class);
+ return (ModuleBuilder) appClientConfigBuilder.getElement();
}
public Object getDeploymentPlan(File planFile, JarFile jarFile, ModuleIDBuilder idBuilder)
throws DeploymentException {
@@ -279,13 +347,18 @@
// get the modules either the application plan or for a stand alone module from the
specific deployer
Module module = null;
- for (ModuleBuilder moduleBuilder : getSortedModuleBuilders()) {
- module = moduleBuilder.createModule(planFile, jarFile, naming, idBuilder);
- if (module != null) {
- break;
- }
+ if (getWebConfigBuilder() != null) {
+ module = getWebConfigBuilder().createModule(planFile, jarFile, naming, idBuilder);
+ }
+ if (module == null && getEjbConfigBuilder() != null) {
+ module = getEjbConfigBuilder().createModule(planFile, jarFile, naming, idBuilder);
+ }
+ if (module == null && getConnectorConfigBuilder() != null) {
+ module = getConnectorConfigBuilder().createModule(planFile, jarFile, naming,
idBuilder);
+ }
+ if (module == null && getAppClientConfigBuilder() != null) {
+ module = getAppClientConfigBuilder().createModule(planFile, jarFile, naming,
idBuilder);
}
-
if (module == null) {
return null;
}
@@ -1063,45 +1136,29 @@
return null;
}
- private List<ModuleBuilder> getSortedModuleBuilders() {
- List<ModuleBuilder> list = new ArrayList<ModuleBuilder>(moduleBuilders);
- Collections.sort(list, new ModuleBuilderComparator());
- return list;
- }
-
- private static class ModuleBuilderComparator implements Comparator<ModuleBuilder>
{
- public int compare(ModuleBuilder o1, ModuleBuilder o2) {
- return o1.getPriority() - o2.getPriority();
- }
- }
-
- private ModuleBuilder getModuleBuilder(Class module) {
- for (ModuleBuilder builder : moduleBuilders) {
- if (builder.supportsModule(module)) {
- return builder;
- }
- }
- return null;
- }
-
private ModuleBuilder getBuilder(Module module) throws DeploymentException {
- ModuleBuilder builder = getModuleBuilder(module.getClass());
-
- if (builder == null) {
- if (module instanceof EJBModule) {
+ if (module instanceof EJBModule) {
+ if (getEjbConfigBuilder() == null) {
throw new DeploymentException("Cannot deploy ejb application; No ejb deployer
defined: " + module.getModuleURI());
- } else if (module instanceof WebModule) {
+ }
+ return getEjbConfigBuilder();
+ } else if (module instanceof WebModule) {
+ if (getWebConfigBuilder() == null) {
throw new DeploymentException("Cannot deploy web application; No war deployer
defined: " + module.getModuleURI());
- } else if (module instanceof ConnectorModule) {
+ }
+ return getWebConfigBuilder();
+ } else if (module instanceof ConnectorModule) {
+ if (getConnectorConfigBuilder() == null) {
throw new DeploymentException("Cannot deploy resource adapter; No rar deployer
defined: " + module.getModuleURI());
- } else if (module instanceof AppClientModule) {
+ }
+ return getConnectorConfigBuilder();
+ } else if (module instanceof AppClientModule) {
+ if (getAppClientConfigBuilder() == null) {
throw new DeploymentException("Cannot deploy app client; No app client deployer
defined: " + module.getModuleURI());
- } else {
- throw new DeploymentException("Cannot deploy application; No deployer for
module: " + module.getModuleURI());
}
- }
-
- return builder;
+ return getAppClientConfigBuilder();
+ }
+ throw new IllegalArgumentException("Unknown module type: " + module.getClass().getName());
}
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
Sun Dec 6 03:45:29 2009
@@ -33,9 +33,6 @@
* @version $Rev:386276 $ $Date$
*/
public interface ModuleBuilder {
-
- int NORMAL_PRIORITY = 50;
-
Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder)
throws DeploymentException;
Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl,
Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder
idBuilder) throws DeploymentException;
@@ -47,15 +44,4 @@
void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository)
throws DeploymentException;
String getSchemaNamespace();
-
- /**
- * Returns sort order priority. Lower numbers indicate higher priority.
- */
- int getPriority();
-
- /**
- * Returns true if this ModuleBuilder creates and installs module of the specified type.
- *
- */
- boolean supportsModule(Class moduleType);
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
Sun Dec 6 03:45:29 2009
@@ -50,14 +50,9 @@
private final Map namespaceToBuilderMap = new HashMap();
- private Class supportedModuleType;
- private int priority = NORMAL_PRIORITY;
private String defaultNamespace;
- public SwitchingModuleBuilder(Collection builders, String supportedModule, int priority)
throws Exception {
- this.supportedModuleType = SwitchingModuleBuilder.class.getClassLoader().loadClass(supportedModule);
- this.priority = priority;
-
+ public SwitchingModuleBuilder(Collection builders) {
ReferenceCollection buildersCollection = (ReferenceCollection) builders;
buildersCollection.addReferenceCollectionListener(new ReferenceCollectionListener()
{
public void memberAdded(ReferenceCollectionEvent event) {
@@ -175,25 +170,15 @@
return null;
}
- public int getPriority() {
- return priority;
- }
-
- public boolean supportsModule(Class moduleType) {
- return supportedModuleType.isAssignableFrom(moduleType);
- }
-
public static final GBeanInfo GBEAN_INFO;
static {
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(SwitchingModuleBuilder.class,
NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("defaultNamespace", String.class, true, true);
- infoBuilder.addAttribute("supportedModule", String.class, true, true);
- infoBuilder.addAttribute("priority", int.class, true, true);
infoBuilder.addReference("ModuleBuilders", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addInterface(ModuleBuilder.class);
- infoBuilder.setConstructor(new String[] {"ModuleBuilders", "supportedModule","priority"});
+ infoBuilder.setConstructor(new String[] {"ModuleBuilders"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
Sun Dec 6 03:45:29 2009
@@ -16,10 +16,8 @@
*/
package org.apache.geronimo.j2ee.deployment;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.HashSet;
@@ -74,6 +72,10 @@
protected static MockConnectorConfigBuilder connectorConfigBuilder = new MockConnectorConfigBuilder();
+ protected static ActivationSpecInfoLocator activationSpecInfoLocator = connectorConfigBuilder;
+
+ protected static ModuleBuilder appClientConfigBuilder = null;
+
protected final static ModuleIDBuilder idBuilder = new ModuleIDBuilder();
protected static final NamespaceDrivenBuilder securityBuilder = null;
@@ -104,6 +106,7 @@
protected static final AbstractName raModuleName = naming.createChildName(earName, "rar",
NameFactory.RESOURCE_ADAPTER_MODULE);
+
protected Map<String, Artifact> locations = new HashMap<String, Artifact>();
protected Environment defaultParentId;
@@ -133,14 +136,6 @@
defaultParentId.addDependency(new Artifact("org.apache.geronimo.tests", "test", "1",
"car"), ImportType.ALL);
}
- private List<ModuleBuilder> getBuilders(ModuleBuilder...builders) {
- List<ModuleBuilder> b = new ArrayList<ModuleBuilder>();
- for (ModuleBuilder builder : builders) {
- b.add(builder);
- }
- return b;
- }
-
public void testBuildConfiguration() throws Exception {
ConfigurationData configurationData = null;
DeploymentContext context = null;
@@ -151,9 +146,11 @@
corbaGBeanAbstractNameQuery,
null,
Collections.singleton(repository),
- getBuilders(ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder),
+ ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder,
+ activationSpecInfoLocator,
+ appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
naming,
@@ -180,9 +177,11 @@
corbaGBeanAbstractNameQuery,
null,
null,
- getBuilders(ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder),
+ ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder,
+ activationSpecInfoLocator,
+ appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -213,9 +212,11 @@
corbaGBeanAbstractNameQuery,
null,
null,
- getBuilders(ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder),
+ ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder,
+ activationSpecInfoLocator,
+ appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -246,9 +247,11 @@
corbaGBeanAbstractNameQuery,
null,
null,
- getBuilders(ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder),
+ ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder,
+ activationSpecInfoLocator,
+ appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -279,9 +282,11 @@
corbaGBeanAbstractNameQuery,
null,
null,
- getBuilders(ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder),
+ ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder,
+ activationSpecInfoLocator,
+ appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -312,8 +317,11 @@
corbaGBeanAbstractNameQuery,
null,
null,
- getBuilders(webConfigBuilder,
- connectorConfigBuilder),
+ null,
+ webConfigBuilder,
+ connectorConfigBuilder,
+ activationSpecInfoLocator,
+ appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -345,8 +353,11 @@
corbaGBeanAbstractNameQuery,
null,
null,
- getBuilders(ejbConfigBuilder,
- connectorConfigBuilder),
+ ejbConfigBuilder,
+ null,
+ connectorConfigBuilder,
+ activationSpecInfoLocator,
+ appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -377,8 +388,11 @@
corbaGBeanAbstractNameQuery,
null,
null,
- getBuilders(ejbConfigBuilder,
- webConfigBuilder),
+ ejbConfigBuilder,
+ webConfigBuilder,
+ null,
+ activationSpecInfoLocator,
+ appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
Sun Dec 6 03:45:29 2009
@@ -114,12 +114,4 @@
public GBeanData locateConnectionFactoryInfo(GBeanData resourceAdapterModuleData, String
connectionFactoryInterfaceName) throws DeploymentException {
return null;
}
-
- public int getPriority() {
- return NORMAL_PRIORITY;
- }
-
- public boolean supportsModule(Class moduleType) {
- return ConnectorModule.class.isAssignableFrom(moduleType);
- }
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
Sun Dec 6 03:45:29 2009
@@ -83,12 +83,4 @@
return null;
}
- public int getPriority() {
- return NORMAL_PRIORITY;
- }
-
- public boolean supportsModule(Class moduleType) {
- return EJBModule.class.isAssignableFrom(moduleType);
- }
-
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
Sun Dec 6 03:45:29 2009
@@ -88,12 +88,4 @@
return null;
}
- public int getPriority() {
- return NORMAL_PRIORITY;
- }
-
- public boolean supportsModule(Class moduleType) {
- return WebModule.class.isAssignableFrom(moduleType);
- }
-
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Sun Dec 6 03:45:29 2009
@@ -747,14 +747,6 @@
webModuleData.setReferencePattern("TrackedConnectionAssociator", moduleContext.getConnectionTrackerName());
}
- public int getPriority() {
- return 10;
- }
-
- public boolean supportsModule(Class moduleType) {
- return WebModule.class.isAssignableFrom(moduleType);
- }
-
private static class InternWrapper implements XMLStreamReader {
private final XMLStreamReader delegate;
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Sun Dec 6 03:45:29
2009
@@ -28,6 +28,9 @@
<reference name="Repositories">
<!--<gbean-name>*:name=Repository,*</gbean-name>-->
</reference>
+ <reference name="WebConfigBuilder">
+ <name>WebBuilder</name>
+ </reference>
<references name="ServiceBuilders">
<pattern>
<name>GBeanBuilder</name>
@@ -41,21 +44,23 @@
<name>PersistenceUnitBuilder</name>
</pattern>
</references>
- <references name="ModuleBuilders">
- <pattern>
- <name>WebBuilder</name>
- </pattern>
+ <references name="EJBConfigBuilder">
<pattern>
<name>EJBBuilder</name>
</pattern>
<pattern>
- <name>ConnectorBuilder</name>
+ <name>UnavailableEJBBuilder</name>
</pattern>
+ </references>
+ <reference name="ConnectorConfigBuilder">
+ <name>ConnectorBuilder</name>
+ </reference>
+ <references name="AppClientConfigBuilder">
<pattern>
<name>AppClientBuilder</name>
</pattern>
<pattern>
- <name>AriesAppBuilder</name>
+ <name>UnavailableAppClientBuilder</name>
</pattern>
</references>
<reference name="ArtifactResolvers">
@@ -77,8 +82,6 @@
<!-- web switching builder -->
<gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}</attribute>
- <attribute name="supportedModule">org.apache.geronimo.j2ee.deployment.WebModule</attribute>
- <attribute name="priority">10</attribute>
<references name="ModuleBuilders">
<pattern>
<name>JettyWebBuilder</name>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=887632&r1=887631&r2=887632&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Sun Dec 6 03:45:29 2009
@@ -898,14 +898,6 @@
return new AbstractNameQuery(artifact, nameMap, (Set) null);
}
- public int getPriority() {
- return 20;
- }
-
- public boolean supportsModule(Class moduleType) {
- return EjbModule.class.isAssignableFrom(moduleType);
- }
-
public static class EarData {
private final Map<String, EjbModule> ejbModules = new TreeMap<String, EjbModule>();
private final Map<String, EjbJarInfo> ejbJars = new TreeMap<String, EjbJarInfo>();
Geronimo Revision: 887507 built with tests included See the full build-0200.log file at http://people.apache.org/builds/geronimo/server/binaries/2.1/20091205/build-0200.log Download the binaries from http://people.apache.org/builds/geronimo/server/binaries/2.1/20091205 [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 36 minutes 16 seconds [INFO] Finished at: Sat Dec 05 02:49:48 EST 2009 [INFO] Final Memory: 268M/912M [INFO] ------------------------------------------------------------------------ TESTSUITE RESULTS (Failures only) ================================= Assembly: tomcat ================================= See full test results and logs at http://people.apache.org/builds/geronimo/server/binaries/2.1/20091205/logs-0200-tomcat/ Assembly: jetty ================================= See full test results and logs at http://people.apache.org/builds/geronimo/server/binaries/2.1/20091205/logs-0200-jetty/ Samples: branches/2.1 ================================= Log: http://people.apache.org/builds/geronimo/server/binaries/2.1/20091205/samples-0200.log Build status: FAILED
Author: djencks
Date: Sat Dec 5 08:35:38 2009
New Revision: 887513
URL: http://svn.apache.org/viewvc?rev=887513&view=rev
Log:
GERONIMO-4976 make bundle context available through servlet context
Modified:
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java?rev=887513&r1=887512&r2=887513&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
Sat Dec 5 08:35:38 2009
@@ -54,6 +54,7 @@
super(sessionHandler, securityHandler, servletHandler, errorHandler);
this.integrationContext = integrationContext;
setClassLoader(classLoader);
+ setAttribute("osgi-bundlecontext", integrationContext.getBundle().getBundleContext());
}
@Override
Author: djencks
Date: Sat Dec 5 07:53:43 2009
New Revision: 887511
URL: http://svn.apache.org/viewvc?rev=887511&view=rev
Log:
GERONIMO-4965. Get base console to compile. Simplify how locations in car are computed slightly, this needs to be ported to openejb and probably myfaces module bundlers
Added:
geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/gbean/
- copied from r886878, geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/gbean/
Removed:
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/gbean/
Modified:
geronimo/server/trunk/plugins/activemq/pom.xml
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/pluto/pom.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Sat Dec 5 07:53:43 2009
@@ -110,6 +110,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Sat Dec 5 07:53:43 2009
@@ -397,11 +397,10 @@
// See AbstractWebModuleBuilder.
earContext.addManifestClassPath(moduleFile, URI.create(module.getTargetPath()));
- URI targetURI = URI.create(module.getTargetPath() + "/");
Enumeration entries = moduleFile.entries();
while (entries.hasMoreElements()) {
ZipEntry entry = (ZipEntry) entries.nextElement();
- URI target = targetURI.resolve(entry.getName());
+ URI target = module.resolve(entry.getName());
if (entry.getName().endsWith(".jar")) {
earContext.addInclude(target, moduleFile, entry);
} else {
@@ -530,6 +529,8 @@
public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
//all our gbeans are added in the initContext step
+ //in case we decide connectors should be separate bundles
+ module.addAsChildConfiguration();
}
public String getSchemaNamespace() {
Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml Sat Dec 5 07:53:43 2009
@@ -12,8 +12,8 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>dwr</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -23,11 +23,21 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty7</artifactId>
+ <artifactId>jetty8</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
<type>car</type>
</dependency>
@@ -42,8 +52,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Sat Dec 5 07:53:43 2009
@@ -37,6 +37,13 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>console-filter</artifactId>
<version>${version}</version>
+ <!--<scope>provided</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-core</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
</dependency>
<!-- for jspc maven plugin -->
Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml Sat Dec 5 07:53:43 2009
@@ -13,11 +13,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml Sat Dec 5 07:53:43 2009
@@ -13,11 +13,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Sat Dec 5 07:53:43 2009
@@ -80,6 +80,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java Sat Dec 5 07:53:43 2009
@@ -23,11 +23,13 @@
import org.apache.xmlbeans.XmlObject;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.xbean.finder.ClassFinder;
/**
@@ -115,6 +117,14 @@
return targetPathURI;
}
+ public URI resolve(String path) {
+ return targetPathURI.resolve(path);
+ }
+
+ public URI resolve(URI path) {
+ return targetPathURI.resolve(path);
+ }
+
public XmlObject getSpecDD() {
return specDD;
}
@@ -219,5 +229,12 @@
public String getRelativePath(String path) {
return path;
}
+
+ public void addAsChildConfiguration() throws DeploymentException {
+ if (rootEarContext != null && rootEarContext != earContext) {
+ ConfigurationData moduleConfigurationData = earContext.getConfigurationData();
+ rootEarContext.addChildConfiguration(getTargetPath(), moduleConfigurationData);
+ }
+ }
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java Sat Dec 5 07:53:43 2009
@@ -45,7 +45,7 @@
}
public String getRelativePath(String path) {
- if (isStandAlone()) {
+ if (isStandAlone() || getRootEarContext() == getEarContext()) {
return path;
}
if (path.startsWith(getTargetPath())) {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Sat Dec 5 07:53:43 2009
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.io.StringWriter;
import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -157,7 +156,7 @@
this.namingBuilders = namingBuilders;
this.resourceEnvironmentSetter = resourceEnvironmentSetter;
this.webServiceBuilder = webServiceBuilder;
- this.moduleBuilderExtensions = moduleBuilderExtensions == null? new ArrayList<ModuleBuilderExtension>(): moduleBuilderExtensions;
+ this.moduleBuilderExtensions = moduleBuilderExtensions == null ? new ArrayList<ModuleBuilderExtension>() : moduleBuilderExtensions;
}
static {
@@ -183,7 +182,7 @@
}
private void addDependencies(LinkedHashSet<GBeanData> dependencies, GBeanData webModuleData) {
- for (GBeanData dependency: dependencies) {
+ for (GBeanData dependency : dependencies) {
AbstractName dependencyName = dependency.getAbstractName();
webModuleData.addDependency(dependencyName);
}
@@ -210,7 +209,7 @@
protected Map<String, String> buildServletNameToPathMap(WebAppType webApp, String contextRoot) {
if (contextRoot == null) {
contextRoot = "";
- } else if (!contextRoot.startsWith("/")) {
+ } else if (!contextRoot.startsWith("/")) {
contextRoot = "/" + contextRoot;
}
Map<String, String> map = new HashMap<String, String>();
@@ -259,7 +258,8 @@
public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
EARContext moduleContext;
- if (module.isStandAlone()) {
+ //TODO GERONIMO-4972 find a way to create working nested bundles.
+ if (true || module.isStandAlone()) {
moduleContext = earContext;
} else {
Environment environment = module.getEnvironment();
@@ -298,7 +298,7 @@
List<ZipEntry> libs = new ArrayList<ZipEntry>();
while (entries.hasMoreElements()) {
ZipEntry entry = entries.nextElement();
- URI targetPath = new URI(null, entry.getName(), null);
+ URI targetPath = module.resolve(entry.getName());
if (entry.getName().equals("WEB-INF/web.xml")) {
moduleContext.addFile(targetPath, module.getOriginalSpecDD());
} else if (entry.getName().startsWith("WEB-INF/lib") && entry.getName().endsWith(".jar")) {
@@ -313,12 +313,12 @@
// always add WEB-INF/classes to the classpath regardless of whether
// any classes exist. This must be searched BEFORE the WEB-INF/lib jar files,
// per the servlet specifications.
- moduleContext.addToClassPath("WEB-INF/classes/");
+ moduleContext.addToClassPath(module.resolve("WEB-INF/classes/").getPath());
manifestcp.add("WEB-INF/classes/");
// install the libs
for (ZipEntry entry : libs) {
- URI targetPath = new URI(null, entry.getName(), null);
+ URI targetPath = module.resolve(entry.getName());
moduleContext.addInclude(targetPath, warFile, entry);
manifestcp.add(entry.getName());
}
@@ -326,13 +326,14 @@
// add the manifest classpath entries declared in the war to the class loader
// we have to explicitly add these since we are unpacking the web module
// and the url class loader will not pick up a manifest from an unpacked dir
+ //GERONIMO-4972 this can't be correct for one-bundle deployments.
moduleContext.addManifestClassPath(warFile, RELATIVE_MODULE_BASE_URI);
moduleContext.getGeneralData().put(ClassPathList.class, manifestcp);
} catch (IOException e) {
throw new DeploymentException("Problem deploying war", e);
- } catch (URISyntaxException e) {
- throw new DeploymentException("Could not construct URI for location of war entry", e);
+// } catch (URISyntaxException e) {
+// throw new DeploymentException("Could not construct URI for location of war entry", e);
} finally {
if (!module.isStandAlone()) {
try {
@@ -342,7 +343,7 @@
}
}
}
- for (ModuleBuilderExtension mbe: moduleBuilderExtensions) {
+ for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
mbe.installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repositories);
}
}
@@ -458,7 +459,7 @@
cursor.push();
if (cursor.toChild(SchemaConversionUtils.JAVAEE_NAMESPACE, "jsp-file")) {
String jspFile = cursor.getTextValue();
- if (!jspFile.startsWith("/")){
+ if (!jspFile.startsWith("/")) {
if (is22) {
cursor.setTextValue("/" + jspFile);
} else {
@@ -762,184 +763,184 @@
}
public void close() throws XMLStreamException {
- delegate.close();
- }
+ delegate.close();
+ }
- public int getAttributeCount() {
- return delegate.getAttributeCount();
- }
+ public int getAttributeCount() {
+ return delegate.getAttributeCount();
+ }
- public String getAttributeLocalName(int i) {
- return delegate.getAttributeLocalName(i);
- }
+ public String getAttributeLocalName(int i) {
+ return delegate.getAttributeLocalName(i);
+ }
- public QName getAttributeName(int i) {
- return delegate.getAttributeName(i);
- }
+ public QName getAttributeName(int i) {
+ return delegate.getAttributeName(i);
+ }
- public String getAttributeNamespace(int i) {
- return delegate.getAttributeNamespace(i);
- }
+ public String getAttributeNamespace(int i) {
+ return delegate.getAttributeNamespace(i);
+ }
- public String getAttributePrefix(int i) {
- return delegate.getAttributePrefix(i);
- }
+ public String getAttributePrefix(int i) {
+ return delegate.getAttributePrefix(i);
+ }
- public String getAttributeType(int i) {
- return delegate.getAttributeType(i);
- }
+ public String getAttributeType(int i) {
+ return delegate.getAttributeType(i);
+ }
- public String getAttributeValue(int i) {
- return delegate.getAttributeValue(i);
- }
+ public String getAttributeValue(int i) {
+ return delegate.getAttributeValue(i);
+ }
- public String getAttributeValue(String s, String s1) {
- return delegate.getAttributeValue(s, s1);
- }
+ public String getAttributeValue(String s, String s1) {
+ return delegate.getAttributeValue(s, s1);
+ }
- public String getCharacterEncodingScheme() {
- return delegate.getCharacterEncodingScheme();
- }
+ public String getCharacterEncodingScheme() {
+ return delegate.getCharacterEncodingScheme();
+ }
- public String getElementText() throws XMLStreamException {
- return delegate.getElementText();
- }
+ public String getElementText() throws XMLStreamException {
+ return delegate.getElementText();
+ }
- public String getEncoding() {
- return delegate.getEncoding();
- }
+ public String getEncoding() {
+ return delegate.getEncoding();
+ }
- public int getEventType() {
- return delegate.getEventType();
- }
+ public int getEventType() {
+ return delegate.getEventType();
+ }
- public String getLocalName() {
- return delegate.getLocalName().intern();
- }
+ public String getLocalName() {
+ return delegate.getLocalName().intern();
+ }
- public Location getLocation() {
- return delegate.getLocation();
- }
+ public Location getLocation() {
+ return delegate.getLocation();
+ }
- public QName getName() {
- return delegate.getName();
- }
+ public QName getName() {
+ return delegate.getName();
+ }
- public NamespaceContext getNamespaceContext() {
- return delegate.getNamespaceContext();
- }
+ public NamespaceContext getNamespaceContext() {
+ return delegate.getNamespaceContext();
+ }
- public int getNamespaceCount() {
- return delegate.getNamespaceCount();
- }
+ public int getNamespaceCount() {
+ return delegate.getNamespaceCount();
+ }
- public String getNamespacePrefix(int i) {
- return delegate.getNamespacePrefix(i);
- }
+ public String getNamespacePrefix(int i) {
+ return delegate.getNamespacePrefix(i);
+ }
- public String getNamespaceURI() {
- return delegate.getNamespaceURI().intern();
- }
+ public String getNamespaceURI() {
+ return delegate.getNamespaceURI().intern();
+ }
- public String getNamespaceURI(int i) {
- return delegate.getNamespaceURI(i);
- }
+ public String getNamespaceURI(int i) {
+ return delegate.getNamespaceURI(i);
+ }
- public String getNamespaceURI(String s) {
- return delegate.getNamespaceURI(s);
- }
+ public String getNamespaceURI(String s) {
+ return delegate.getNamespaceURI(s);
+ }
- public String getPIData() {
- return delegate.getPIData();
- }
+ public String getPIData() {
+ return delegate.getPIData();
+ }
- public String getPITarget() {
- return delegate.getPITarget();
- }
+ public String getPITarget() {
+ return delegate.getPITarget();
+ }
- public String getPrefix() {
- return delegate.getPrefix();
- }
+ public String getPrefix() {
+ return delegate.getPrefix();
+ }
- public Object getProperty(String s) throws IllegalArgumentException {
- return delegate.getProperty(s);
- }
+ public Object getProperty(String s) throws IllegalArgumentException {
+ return delegate.getProperty(s);
+ }
- public String getText() {
- return delegate.getText();
- }
+ public String getText() {
+ return delegate.getText();
+ }
- public char[] getTextCharacters() {
- return delegate.getTextCharacters();
- }
+ public char[] getTextCharacters() {
+ return delegate.getTextCharacters();
+ }
- public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
- return delegate.getTextCharacters(i, chars, i1, i2);
- }
+ public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
+ return delegate.getTextCharacters(i, chars, i1, i2);
+ }
- public int getTextLength() {
- return delegate.getTextLength();
- }
+ public int getTextLength() {
+ return delegate.getTextLength();
+ }
- public int getTextStart() {
- return delegate.getTextStart();
- }
+ public int getTextStart() {
+ return delegate.getTextStart();
+ }
- public String getVersion() {
- return delegate.getVersion();
- }
+ public String getVersion() {
+ return delegate.getVersion();
+ }
- public boolean hasName() {
- return delegate.hasName();
- }
+ public boolean hasName() {
+ return delegate.hasName();
+ }
- public boolean hasNext() throws XMLStreamException {
- return delegate.hasNext();
- }
+ public boolean hasNext() throws XMLStreamException {
+ return delegate.hasNext();
+ }
- public boolean hasText() {
- return delegate.hasText();
- }
+ public boolean hasText() {
+ return delegate.hasText();
+ }
- public boolean isAttributeSpecified(int i) {
- return delegate.isAttributeSpecified(i);
- }
+ public boolean isAttributeSpecified(int i) {
+ return delegate.isAttributeSpecified(i);
+ }
- public boolean isCharacters() {
- return delegate.isCharacters();
- }
+ public boolean isCharacters() {
+ return delegate.isCharacters();
+ }
- public boolean isEndElement() {
- return delegate.isEndElement();
- }
+ public boolean isEndElement() {
+ return delegate.isEndElement();
+ }
- public boolean isStandalone() {
- return delegate.isStandalone();
- }
+ public boolean isStandalone() {
+ return delegate.isStandalone();
+ }
- public boolean isStartElement() {
- return delegate.isStartElement();
- }
+ public boolean isStartElement() {
+ return delegate.isStartElement();
+ }
- public boolean isWhiteSpace() {
- return delegate.isWhiteSpace();
- }
+ public boolean isWhiteSpace() {
+ return delegate.isWhiteSpace();
+ }
- public int next() throws XMLStreamException {
- return delegate.next();
- }
+ public int next() throws XMLStreamException {
+ return delegate.next();
+ }
- public int nextTag() throws XMLStreamException {
- return delegate.nextTag();
- }
+ public int nextTag() throws XMLStreamException {
+ return delegate.nextTag();
+ }
- public void require(int i, String s, String s1) throws XMLStreamException {
- delegate.require(i, s, s1);
- }
+ public void require(int i, String s, String s1) throws XMLStreamException {
+ delegate.require(i, s, s1);
+ }
- public boolean standaloneSet() {
- return delegate.standaloneSet();
- }
+ public boolean standaloneSet() {
+ return delegate.standaloneSet();
+ }
}
-
+
}
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java Sat Dec 5 07:53:43 2009
@@ -32,6 +32,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.LinkedHashSet;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -144,7 +145,7 @@
GBeanData webAppData = (GBeanData) sharedContext.get(WebModule.WEB_APP_DATA);
- AbstractName moduleName = moduleContext.getModuleName();
+ AbstractName moduleName = module.getModuleName();
Map<NamingBuilder.Key, Object> buildingContext = new HashMap<NamingBuilder.Key, Object>();
buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
@@ -192,7 +193,7 @@
}
protected ClassFinder createJspClassFinder(WebAppType webApp, WebModule webModule, Set<String> listenerNames) throws DeploymentException {
- List<URL> urls = getTldFiles(webApp, webModule);
+ Collection<URL> urls = getTldFiles(webApp, webModule);
List<Class> classes = getListenerClasses(webApp, webModule, urls, listenerNames);
return new ClassFinder(classes);
}
@@ -215,12 +216,12 @@
* @return list of the URL(s) for the TLD files
* @throws DeploymentException if there's a problem finding a tld file
*/
- private List<URL> getTldFiles(WebAppType webApp, WebModule webModule) throws DeploymentException {
+ private LinkedHashSet<URL> getTldFiles(WebAppType webApp, WebModule webModule) throws DeploymentException {
if (log.isDebugEnabled()) {
log.debug("getTldFiles( " + webApp.toString() + "," + webModule.getName() + " ): Entry");
}
- List<URL> tldURLs = new ArrayList<URL>();
+ LinkedHashSet<URL> tldURLs = new LinkedHashSet<URL>();
// 1. web.xml <taglib> entries
JspConfigType[] jspConfigs = webApp.getJspConfigArray();
@@ -234,9 +235,9 @@
location = location.substring(1);
}
try {
- File targetFile = webModule.getEarContext().getTargetFile(createURI(location));
+ File targetFile = webModule.getEarContext().getTargetFile(webModule.resolve(createURI(location)));
if (targetFile!=null) {
- tldURLs.add(targetFile.toURL());
+ tldURLs.add(targetFile.toURI().toURL());
}
}
catch (MalformedURLException mfe) {
@@ -251,23 +252,15 @@
// 2. TLD(s) in JAR files in WEB-INF/lib
// 3. TLD(s) under WEB-INF
- List<URL> tempURLs = scanModule(webModule);
- for (URL webInfURL : tempURLs) {
- tldURLs.add(webInfURL);
- }
+ tldURLs.addAll(scanModule(webModule));
// 4. All TLD files in all META-INF(s)
- tempURLs.clear();
try {
Enumeration<URL> enumURLs = webModule.getEarContext().getDeploymentBundle().getResources("META-INF");
if (enumURLs != null) {
while (enumURLs.hasMoreElements()) {
URL enumURL = enumURLs.nextElement();
- tempURLs = scanDirectory(enumURL);
- for (URL metaInfURL : tempURLs) {
- tldURLs.add(metaInfURL);
- }
- tempURLs.clear();
+ tldURLs.addAll(scanDirectory(enumURL));
}
}
}
@@ -297,13 +290,13 @@
while (entries.hasMoreElements()) {
JarEntry jarEntry = entries.nextElement();
if (jarEntry.getName().startsWith("WEB-INF/") && jarEntry.getName().endsWith(".tld")) {
- File targetFile = webModule.getEarContext().getTargetFile(createURI(jarEntry.getName()));
+ File targetFile = webModule.getEarContext().getTargetFile(webModule.resolve(createURI(jarEntry.getName())));
if (targetFile!=null) {
modURLs.add(targetFile.toURL());
}
}
if (jarEntry.getName().startsWith("WEB-INF/lib/") && jarEntry.getName().endsWith(".jar")) {
- File targetFile = webModule.getEarContext().getTargetFile(createURI(jarEntry.getName()));
+ File targetFile = webModule.getEarContext().getTargetFile(webModule.resolve(createURI(jarEntry.getName())));
List<URL> jarUrls = scanJAR(new JarFile(targetFile), null);
for (URL jarURL : jarUrls) {
modURLs.add(jarURL);
@@ -339,19 +332,15 @@
Enumeration<JarEntry> entries = jarFile.entries();
while (entries.hasMoreElements()) {
JarEntry jarEntry = entries.nextElement();
- URL tempURL = null;
if (prefix != null) {
if (jarEntry.getName().endsWith(".tld") && jarEntry.getName().startsWith(prefix)) {
- tempURL = new URL("jar:file:" + jarFile.getName() + "!/" + jarEntry.getName());
+ jarURLs.add(new URL("jar:file:" + jarFile.getName() + "!/" + jarEntry.getName()));
}
} else {
if (jarEntry.getName().endsWith(".tld")) {
- tempURL = new URL("jar:file:" + jarFile.getName() + "!/" + jarEntry.getName());
+ jarURLs.add(new URL("jar:file:" + jarFile.getName() + "!/" + jarEntry.getName()));
}
}
- if (tempURL != null) {
- jarURLs.add(tempURL);
- }
}
}
catch (MalformedURLException mfe) {
@@ -428,7 +417,7 @@
}
- private List<Class> getListenerClasses(WebAppType webApp, WebModule webModule, List<URL> urls, Set<String> listenerNames) throws DeploymentException {
+ private List<Class> getListenerClasses(WebAppType webApp, WebModule webModule, Collection<URL> urls, Set<String> listenerNames) throws DeploymentException {
if (log.isDebugEnabled()) {
log.debug("getListenerClasses( " + webApp.toString() + "," + '\n' +
webModule.getName() + " ): Entry");
Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml Sat Dec 5 07:53:43 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jaxws-deployer</artifactId>
@@ -18,7 +18,27 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jaxws</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jaxws-builder</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java Sat Dec 5 07:53:43 2009
@@ -373,7 +373,7 @@
public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
EARContext moduleContext = module.getEarContext();
- AbstractName moduleName = moduleContext.getModuleName();
+ AbstractName moduleName = module.getModuleName();
WebModule webModule = (WebModule) module;
WebAppType webApp = (WebAppType) webModule.getSpecDD();
@@ -550,10 +550,7 @@
}
webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
- if (!module.isStandAlone()) {
- ConfigurationData moduleConfigurationData = moduleContext.getConfigurationData();
- earContext.addChildConfiguration(module.getTargetPath(), moduleConfigurationData);
- }
+ module.addAsChildConfiguration();
} catch (DeploymentException de) {
throw de;
} catch (Exception e) {
Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml Sat Dec 5 07:53:43 2009
@@ -58,6 +58,10 @@
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<!--<scope>provided</scope>-->
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml Sat Dec 5 07:53:43 2009
@@ -7,41 +7,11 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<type>jar</type>
@@ -171,9 +141,4 @@
<artifactId>pax-logging-api</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pom.xml Sat Dec 5 07:53:43 2009
@@ -18,7 +18,8 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -45,214 +46,175 @@
<plutoVersion>2.0.1-SNAPSHOT</plutoVersion>
</properties>
- <dependencyManagement>
- <dependencies>
+ <dependencyManagement>
+ <dependencies>
- <dependency>
- <groupId>org.apache.portals</groupId>
- <artifactId>portlet-api_2.0_spec</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- Admin Console support -->
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-portal-driver</artifactId>
- <version>${plutoVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-portal-driver-impl</artifactId>
- <version>${plutoVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container-api</artifactId>
- <version>${plutoVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container-driver-api</artifactId>
- <version>${plutoVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-container</artifactId>
- <version>${plutoVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-taglib</artifactId>
- <version>${plutoVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.portals.pluto</groupId>-->
- <!--<artifactId>pluto-descriptor-impl</artifactId>-->
- <!--<version>${plutoVersion}</version>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>commons-io</groupId>-->
- <!--<artifactId>commons-io</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>commons-logging</groupId>-->
- <!--<artifactId>commons-logging</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>commons-logging</groupId>-->
- <!--<artifactId>commons-logging-api</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>xerces</groupId>-->
- <!--<artifactId>xercesImpl</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>xerces</groupId>-->
- <!--<artifactId>xmlParserAPIs</artifactId>-->
- <!--</exclusion>-->
- <!--<exclusion>-->
- <!--<groupId>xml-apis</groupId>-->
- <!--<artifactId>xml-apis</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.portals.pluto</groupId>-->
- <!--<artifactId>pluto-descriptor-api</artifactId>-->
- <!--<version>${plutoVersion}</version>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portlet-api_2.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container</artifactId>
+ <version>${plutoVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container-api</artifactId>
+ <version>${plutoVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-container-driver-api</artifactId>
+ <version>${plutoVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-portal-driver</artifactId>
+ <version>${plutoVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-portal-driver-impl</artifactId>
+ <version>${plutoVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>pluto-taglib</artifactId>
+ <version>${plutoVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- </dependencies>
- </dependencyManagement>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Sat Dec 5 07:53:43 2009
@@ -106,7 +106,7 @@
<module>client</module>
<module>clustering</module>
<module>connector-1_6</module>
- <!--<module>console</module>-->
+ <module>console</module>
<!--<module>corba</module>-->
<!--<module>cxf</module>-->
<!--<module>dojo</module>-->
@@ -128,7 +128,7 @@
<!--<module>monitoring</module>-->
<!--<module>remote-deploy</module>-->
<!--<module>sharedlib</module>-->
- <!--<module>welcome</module>-->
+ <module>welcome</module>
<!--<module>concurrent</module>-->
<!--<module>procrun</module>-->
<module>jetty8</module>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Sat Dec 5 07:53:43 2009
@@ -342,7 +342,7 @@
public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
EARContext moduleContext = module.getEarContext();
Bundle webBundle = moduleContext.getDeploymentBundle();
- AbstractName moduleName = moduleContext.getModuleName();
+ AbstractName moduleName = module.getModuleName();
WebModule webModule = (WebModule) module;
WebAppType webApp = (WebAppType) webModule.getSpecDD();
@@ -578,10 +578,7 @@
// }
}
- if (!module.isStandAlone()) {
- ConfigurationData moduleConfigurationData = moduleContext.getConfigurationData();
- earContext.addChildConfiguration(module.getTargetPath(), moduleConfigurationData);
- }
+ module.addAsChildConfiguration();
} catch (DeploymentException de) {
throw de;
} catch (Exception e) {
Author: gawor
Date: Sat Dec 5 06:24:26 2009
New Revision: 887507
URL: http://svn.apache.org/viewvc?rev=887507&view=rev
Log:
GERONIMO-4975: Simplify integrating new ModuleBuilders with EARConfigBuilder
Removed:
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
Modified:
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
Sat Dec 5 06:24:26 2009
@@ -216,4 +216,11 @@
return null;
}
+ public int getPriority() {
+ return 50;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return AriesAppModule.class.isAssignableFrom(moduleType);
+ }
}
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Sat Dec 5 06:24:26 2009
@@ -839,6 +839,14 @@
return GERAPPCLIENT_NAMESPACE;
}
+ public int getPriority() {
+ return 40;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return AppClientModule.class.isAssignableFrom(moduleType);
+ }
+
public void addManifestClassPath(DeploymentContext deploymentContext, JarFile earFile,
JarFile jarFile, URI jarFileLocation) throws DeploymentException {
Manifest manifest;
try {
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Sat Dec 5 06:24:26 2009
@@ -536,6 +536,14 @@
return GERCONNECTOR_NAMESPACE;
}
+ public int getPriority() {
+ return 30;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return ConnectorModule.class.isAssignableFrom(moduleType);
+ }
+
private void addConnectorGBeans(EARContext earContext, AbstractName jcaResourceName,
GBeanData resourceAdapterModuleData, ConnectorType connector, GerConnectorType geronimoConnector,
Bundle bundle) throws DeploymentException {
ResourceadapterType resourceadapter = connector.getResourceadapter();
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Sat Dec 5 06:24:26 2009
@@ -22,6 +22,7 @@
import java.net.URL;
import java.sql.Connection;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -29,7 +30,6 @@
import java.util.HashMap;
import java.util.jar.JarFile;
-import javax.naming.Reference;
import javax.sql.DataSource;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.DeploymentContext;
@@ -41,7 +41,6 @@
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
@@ -90,22 +89,6 @@
private Environment defaultEnvironment;
private ConfigurationStore configurationStore = new MockConfigStore();
private MockRepository repository;
-
- private ActivationSpecInfoLocator activationSpecInfoLocator = new ActivationSpecInfoLocator()
{
-
- public Reference createResourceRef(AbstractNameQuery containerId, Class iface, Configuration
configuration) {
- return null;
- }
-
- public Reference createAdminObjectRef(AbstractNameQuery containerId, Class iface,
Configuration configuration) {
- return null;
- }
-
- public GBeanData locateActivationSpecInfo(AbstractNameQuery nameQuery, String messageListenerInterface,
Configuration configuration) {
- return null;
- }
- };
-
private Kernel kernel;
private ConfigurationManager configurationManager;
private static final Naming naming = new Jsr77Naming();
@@ -122,17 +105,15 @@
rarFile = DeploymentUtil.createJarFile(new File(BASEDIR, "target/test-ear-noger.ear"));
GBeanBuilder serviceBuilder = new GBeanBuilder(null, null);
// EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment, transactionContextManagerName,
connectionTrackerName, null, null, null, new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()),
null, null, ejbReferenceBuilder, null,
+ List<ModuleBuilder> builders = new ArrayList<ModuleBuilder>();
+ builders.add(new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize,
defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching,
defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(serviceBuilder)));
EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment,
transactionManagerName,
connectionTrackerName,
null,
new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()),
Collections.singleton(repository),
- null,
- null,
- new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize,
defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching,
defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(serviceBuilder)),
- activationSpecInfoLocator,
- null,
+ builders,
serviceBuilder,
null,
kernel.getNaming(),
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Sat Dec 5 06:24:26 2009
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
@@ -60,7 +61,6 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.gbean.ReferencePatterns;
-import org.apache.geronimo.gbean.SingleElementCollection;
import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamAttribute;
import org.apache.geronimo.gbean.annotation.ParamReference;
@@ -123,11 +123,7 @@
private final ConfigurationManager configurationManager;
private final Collection<? extends Repository> repositories;
- private final SingleElementCollection ejbConfigBuilder;
- private final SingleElementCollection webConfigBuilder;
- private final SingleElementCollection connectorConfigBuilder;
- private final SingleElementCollection appClientConfigBuilder;
- private final SingleElementCollection resourceReferenceBuilder;
+ private final Collection<ModuleBuilder> moduleBuilders;
private final NamespaceDrivenBuilderCollection serviceBuilders;
private final Collection<ModuleBuilderExtension> persistenceUnitBuilders;
@@ -154,57 +150,13 @@
}
};
-// static {
-// GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(EARConfigBuilder.class,
NameFactory.CONFIG_BUILDER);
-// infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-// infoBuilder.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class,
true);
-// infoBuilder.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class,
true);
-// infoBuilder.addAttribute("corbaGBeanAbstractName", AbstractNameQuery.class, true);
-// infoBuilder.addAttribute("serverName", AbstractNameQuery.class, true);
-//
-// infoBuilder.addReference("Repositories", Repository.class, "Repository");
-// infoBuilder.addReference("EJBConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-// infoBuilder.addReference("WebConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-// infoBuilder.addReference("ConnectorConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-// infoBuilder.addReference("ActivationSpecInfoLocator", ActivationSpecInfoLocator.class,
NameFactory.MODULE_BUILDER);
-// infoBuilder.addReference("AppClientConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-// infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
-// infoBuilder.addReference("PersistenceUnitBuilders", ModuleBuilderExtension.class,
NameFactory.MODULE_BUILDER);
-// infoBuilder.addReference("ArtifactResolvers", ArtifactResolver.class, "ArtifactResolver");
-//
-// infoBuilder.addAttribute("kernel", Kernel.class, false);
-//
-// infoBuilder.setConstructor(new String[]{
-// "defaultEnvironment",
-// "transactionManagerAbstractName",
-// "connectionTrackerAbstractName",
-// "corbaGBeanAbstractName",
-// "serverName",
-// "Repositories",
-// "EJBConfigBuilder",
-// "WebConfigBuilder",
-// "ConnectorConfigBuilder",
-// "ActivationSpecInfoLocator",
-// "AppClientConfigBuilder",
-// "ServiceBuilders",
-// "PersistenceUnitBuilders",
-// "ArtifactResolvers",
-// "kernel"
-// });
-//
-// }
-
public EARConfigBuilder(@ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
@ParamAttribute(name = "transactionManagerAbstractName") AbstractNameQuery
transactionManagerAbstractName,
@ParamAttribute(name = "connectionTrackerAbstractName") AbstractNameQuery
connectionTrackerAbstractName,
@ParamAttribute(name = "corbaGBeanAbstractName") AbstractNameQuery
corbaGBeanAbstractName,
@ParamAttribute(name = "serverName") AbstractNameQuery serverName,
@ParamReference(name = "Repositories", namingType = "Repository")Collection<?
extends Repository> repositories,
- @ParamReference(name = "EJBConfigBuilder", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder>
ejbConfigBuilder,
- @ParamReference(name = "WebConfigBuilder", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder>
webConfigBuilder,
- @ParamReference(name = "ConnectorConfigBuilder", namingType =
NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> connectorConfigBuilder,
- @ParamReference(name = "ActivationSpecInfoLocator", namingType
= NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> resourceReferenceBuilder,
- @ParamReference(name = "AppClientConfigBuilder", namingType =
NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> appClientConfigBuilder,
+ @ParamReference(name = "ModuleBuilders", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder>
moduleBuilders,
@ParamReference(name = "ServiceBuilders", namingType = NameFactory.MODULE_BUILDER)Collection<NamespaceDrivenBuilder>
serviceBuilders,
@ParamReference(name = "PersistenceUnitBuilders", namingType
= NameFactory.MODULE_BUILDER)Collection<ModuleBuilderExtension> persistenceUnitBuilders,
@ParamReference(name = "ArtifactResolvers", namingType = "ArtifactResolver")Collection<?
extends ArtifactResolver> artifactResolvers,
@@ -217,11 +169,7 @@
serverName,
ConfigurationUtil.getConfigurationManager(kernel),
repositories,
- new SingleElementCollection<ModuleBuilder>(ejbConfigBuilder),
- new SingleElementCollection<ModuleBuilder>(webConfigBuilder),
- new SingleElementCollection<ModuleBuilder>(connectorConfigBuilder),
- new SingleElementCollection<ModuleBuilder>(resourceReferenceBuilder),
- new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
+ moduleBuilders,
serviceBuilders,
persistenceUnitBuilders,
kernel.getNaming(), artifactResolvers,
@@ -234,11 +182,7 @@
AbstractNameQuery corbaGBeanAbstractName,
AbstractNameQuery serverName,
Collection<? extends Repository> repositories,
- ModuleBuilder ejbConfigBuilder,
- ModuleBuilder webConfigBuilder,
- ModuleBuilder connectorConfigBuilder,
- ActivationSpecInfoLocator activationSpecInfoLocator,
- ModuleBuilder appClientConfigBuilder,
+ Collection<ModuleBuilder> moduleBuilders,
NamespaceDrivenBuilder serviceBuilder,
ModuleBuilderExtension persistenceUnitBuilder,
Naming naming,
@@ -250,11 +194,7 @@
serverName,
null,
repositories,
- new SingleElementCollection<ModuleBuilder>(ejbConfigBuilder),
- new SingleElementCollection<ModuleBuilder>(webConfigBuilder),
- new SingleElementCollection<ModuleBuilder>(connectorConfigBuilder),
- new SingleElementCollection<ActivationSpecInfoLocator>(activationSpecInfoLocator),
- new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
+ moduleBuilders,
serviceBuilder == null ? Collections.<NamespaceDrivenBuilder>emptySet()
: Collections.singleton(serviceBuilder),
persistenceUnitBuilder == null ? Collections.<ModuleBuilderExtension>emptySet()
: Collections.singleton(persistenceUnitBuilder),
naming,
@@ -269,11 +209,7 @@
AbstractNameQuery serverName,
ConfigurationManager configurationManager,
Collection<? extends Repository> repositories,
- SingleElementCollection ejbConfigBuilder,
- SingleElementCollection webConfigBuilder,
- SingleElementCollection connectorConfigBuilder,
- SingleElementCollection resourceReferenceBuilder,
- SingleElementCollection appClientConfigBuilder,
+ Collection<ModuleBuilder> moduleBuilders,
Collection<NamespaceDrivenBuilder> serviceBuilders,
Collection<ModuleBuilderExtension> persistenceUnitBuilders,
Naming naming,
@@ -283,11 +219,7 @@
this.repositories = repositories;
this.defaultEnvironment = defaultEnvironment;
- this.ejbConfigBuilder = ejbConfigBuilder;
- this.resourceReferenceBuilder = resourceReferenceBuilder;
- this.webConfigBuilder = webConfigBuilder;
- this.connectorConfigBuilder = connectorConfigBuilder;
- this.appClientConfigBuilder = appClientConfigBuilder;
+ this.moduleBuilders = moduleBuilders;
this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
this.persistenceUnitBuilders = persistenceUnitBuilders;
@@ -315,21 +247,21 @@
public AbstractNameQuery getCorbaGBeanName() {
return corbaGBeanObjectName;
}
-
+
private ModuleBuilder getEjbConfigBuilder() {
- return (ModuleBuilder) ejbConfigBuilder.getElement();
+ return getModuleBuilder(EJBModule.class);
}
-
+
private ModuleBuilder getWebConfigBuilder() {
- return (ModuleBuilder) webConfigBuilder.getElement();
+ return getModuleBuilder(WebModule.class);
}
-
+
private ModuleBuilder getConnectorConfigBuilder() {
- return (ModuleBuilder) connectorConfigBuilder.getElement();
+ return getModuleBuilder(ConnectorModule.class);
}
-
+
private ModuleBuilder getAppClientConfigBuilder() {
- return (ModuleBuilder) appClientConfigBuilder.getElement();
+ return getModuleBuilder(AppClientModule.class);
}
public Object getDeploymentPlan(File planFile, JarFile jarFile, ModuleIDBuilder idBuilder)
throws DeploymentException {
@@ -347,18 +279,13 @@
// get the modules either the application plan or for a stand alone module from the
specific deployer
Module module = null;
- if (getWebConfigBuilder() != null) {
- module = getWebConfigBuilder().createModule(planFile, jarFile, naming, idBuilder);
- }
- if (module == null && getEjbConfigBuilder() != null) {
- module = getEjbConfigBuilder().createModule(planFile, jarFile, naming, idBuilder);
- }
- if (module == null && getConnectorConfigBuilder() != null) {
- module = getConnectorConfigBuilder().createModule(planFile, jarFile, naming,
idBuilder);
- }
- if (module == null && getAppClientConfigBuilder() != null) {
- module = getAppClientConfigBuilder().createModule(planFile, jarFile, naming,
idBuilder);
+ for (ModuleBuilder moduleBuilder : getSortedModuleBuilders()) {
+ module = moduleBuilder.createModule(planFile, jarFile, naming, idBuilder);
+ if (module != null) {
+ break;
+ }
}
+
if (module == null) {
return null;
}
@@ -1136,29 +1063,45 @@
return null;
}
+ private List<ModuleBuilder> getSortedModuleBuilders() {
+ List<ModuleBuilder> list = new ArrayList<ModuleBuilder>(moduleBuilders);
+ Collections.sort(list, new ModuleBuilderComparator());
+ return list;
+ }
+
+ private static class ModuleBuilderComparator implements Comparator<ModuleBuilder>
{
+ public int compare(ModuleBuilder o1, ModuleBuilder o2) {
+ return o1.getPriority() - o2.getPriority();
+ }
+ }
+
+ private ModuleBuilder getModuleBuilder(Class module) {
+ for (ModuleBuilder builder : moduleBuilders) {
+ if (builder.supportsModule(module)) {
+ return builder;
+ }
+ }
+ return null;
+ }
+
private ModuleBuilder getBuilder(Module module) throws DeploymentException {
- if (module instanceof EJBModule) {
- if (getEjbConfigBuilder() == null) {
+ ModuleBuilder builder = getModuleBuilder(module.getClass());
+
+ if (builder == null) {
+ if (module instanceof EJBModule) {
throw new DeploymentException("Cannot deploy ejb application; No ejb deployer
defined: " + module.getModuleURI());
- }
- return getEjbConfigBuilder();
- } else if (module instanceof WebModule) {
- if (getWebConfigBuilder() == null) {
+ } else if (module instanceof WebModule) {
throw new DeploymentException("Cannot deploy web application; No war deployer
defined: " + module.getModuleURI());
- }
- return getWebConfigBuilder();
- } else if (module instanceof ConnectorModule) {
- if (getConnectorConfigBuilder() == null) {
+ } else if (module instanceof ConnectorModule) {
throw new DeploymentException("Cannot deploy resource adapter; No rar deployer
defined: " + module.getModuleURI());
- }
- return getConnectorConfigBuilder();
- } else if (module instanceof AppClientModule) {
- if (getAppClientConfigBuilder() == null) {
+ } else if (module instanceof AppClientModule) {
throw new DeploymentException("Cannot deploy app client; No app client deployer
defined: " + module.getModuleURI());
+ } else {
+ throw new DeploymentException("Cannot deploy application; No deployer for
module: " + module.getModuleURI());
}
- return getAppClientConfigBuilder();
- }
- throw new IllegalArgumentException("Unknown module type: " + module.getClass().getName());
+ }
+
+ return builder;
}
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
Sat Dec 5 06:24:26 2009
@@ -33,6 +33,9 @@
* @version $Rev:386276 $ $Date$
*/
public interface ModuleBuilder {
+
+ int NORMAL_PRIORITY = 50;
+
Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder)
throws DeploymentException;
Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl,
Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder
idBuilder) throws DeploymentException;
@@ -44,4 +47,15 @@
void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository)
throws DeploymentException;
String getSchemaNamespace();
+
+ /**
+ * Returns sort order priority. Lower numbers indicate higher priority.
+ */
+ int getPriority();
+
+ /**
+ * Returns true if this ModuleBuilder creates and installs module of the specified type.
+ *
+ */
+ boolean supportsModule(Class moduleType);
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
Sat Dec 5 06:24:26 2009
@@ -50,9 +50,14 @@
private final Map namespaceToBuilderMap = new HashMap();
+ private Class supportedModuleType;
+ private int priority = NORMAL_PRIORITY;
private String defaultNamespace;
- public SwitchingModuleBuilder(Collection builders) {
+ public SwitchingModuleBuilder(Collection builders, String supportedModule, int priority)
throws Exception {
+ this.supportedModuleType = SwitchingModuleBuilder.class.getClassLoader().loadClass(supportedModule);
+ this.priority = priority;
+
ReferenceCollection buildersCollection = (ReferenceCollection) builders;
buildersCollection.addReferenceCollectionListener(new ReferenceCollectionListener()
{
public void memberAdded(ReferenceCollectionEvent event) {
@@ -170,15 +175,25 @@
return null;
}
+ public int getPriority() {
+ return priority;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return supportedModuleType.isAssignableFrom(moduleType);
+ }
+
public static final GBeanInfo GBEAN_INFO;
static {
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(SwitchingModuleBuilder.class,
NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("defaultNamespace", String.class, true, true);
+ infoBuilder.addAttribute("supportedModule", String.class, true, true);
+ infoBuilder.addAttribute("priority", int.class, true, true);
infoBuilder.addReference("ModuleBuilders", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addInterface(ModuleBuilder.class);
- infoBuilder.setConstructor(new String[] {"ModuleBuilders"});
+ infoBuilder.setConstructor(new String[] {"ModuleBuilders", "supportedModule","priority"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
Sat Dec 5 06:24:26 2009
@@ -16,8 +16,10 @@
*/
package org.apache.geronimo.j2ee.deployment;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.HashSet;
@@ -72,10 +74,6 @@
protected static MockConnectorConfigBuilder connectorConfigBuilder = new MockConnectorConfigBuilder();
- protected static ActivationSpecInfoLocator activationSpecInfoLocator = connectorConfigBuilder;
-
- protected static ModuleBuilder appClientConfigBuilder = null;
-
protected final static ModuleIDBuilder idBuilder = new ModuleIDBuilder();
protected static final NamespaceDrivenBuilder securityBuilder = null;
@@ -106,7 +104,6 @@
protected static final AbstractName raModuleName = naming.createChildName(earName, "rar",
NameFactory.RESOURCE_ADAPTER_MODULE);
-
protected Map<String, Artifact> locations = new HashMap<String, Artifact>();
protected Environment defaultParentId;
@@ -136,6 +133,14 @@
defaultParentId.addDependency(new Artifact("org.apache.geronimo.tests", "test", "1",
"car"), ImportType.ALL);
}
+ private List<ModuleBuilder> getBuilders(ModuleBuilder...builders) {
+ List<ModuleBuilder> b = new ArrayList<ModuleBuilder>();
+ for (ModuleBuilder builder : builders) {
+ b.add(builder);
+ }
+ return b;
+ }
+
public void testBuildConfiguration() throws Exception {
ConfigurationData configurationData = null;
DeploymentContext context = null;
@@ -146,11 +151,9 @@
corbaGBeanAbstractNameQuery,
null,
Collections.singleton(repository),
- ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder,
- activationSpecInfoLocator,
- appClientConfigBuilder,
+ getBuilders(ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder),
serviceBuilder,
persistenceUnitBuilder,
naming,
@@ -177,11 +180,9 @@
corbaGBeanAbstractNameQuery,
null,
null,
- ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder,
- activationSpecInfoLocator,
- appClientConfigBuilder,
+ getBuilders(ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder),
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -212,11 +213,9 @@
corbaGBeanAbstractNameQuery,
null,
null,
- ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder,
- activationSpecInfoLocator,
- appClientConfigBuilder,
+ getBuilders(ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder),
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -247,11 +246,9 @@
corbaGBeanAbstractNameQuery,
null,
null,
- ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder,
- activationSpecInfoLocator,
- appClientConfigBuilder,
+ getBuilders(ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder),
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -282,11 +279,9 @@
corbaGBeanAbstractNameQuery,
null,
null,
- ejbConfigBuilder,
- webConfigBuilder,
- connectorConfigBuilder,
- activationSpecInfoLocator,
- appClientConfigBuilder,
+ getBuilders(ejbConfigBuilder,
+ webConfigBuilder,
+ connectorConfigBuilder),
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -317,11 +312,8 @@
corbaGBeanAbstractNameQuery,
null,
null,
- null,
- webConfigBuilder,
- connectorConfigBuilder,
- activationSpecInfoLocator,
- appClientConfigBuilder,
+ getBuilders(webConfigBuilder,
+ connectorConfigBuilder),
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -353,11 +345,8 @@
corbaGBeanAbstractNameQuery,
null,
null,
- ejbConfigBuilder,
- null,
- connectorConfigBuilder,
- activationSpecInfoLocator,
- appClientConfigBuilder,
+ getBuilders(ejbConfigBuilder,
+ connectorConfigBuilder),
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
@@ -388,11 +377,8 @@
corbaGBeanAbstractNameQuery,
null,
null,
- ejbConfigBuilder,
- webConfigBuilder,
- null,
- activationSpecInfoLocator,
- appClientConfigBuilder,
+ getBuilders(ejbConfigBuilder,
+ webConfigBuilder),
serviceBuilder,
persistenceUnitBuilder,
naming, artifactResolvers, bundleContext);
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
Sat Dec 5 06:24:26 2009
@@ -114,4 +114,12 @@
public GBeanData locateConnectionFactoryInfo(GBeanData resourceAdapterModuleData, String
connectionFactoryInterfaceName) throws DeploymentException {
return null;
}
+
+ public int getPriority() {
+ return NORMAL_PRIORITY;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return ConnectorModule.class.isAssignableFrom(moduleType);
+ }
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
Sat Dec 5 06:24:26 2009
@@ -83,4 +83,12 @@
return null;
}
+ public int getPriority() {
+ return NORMAL_PRIORITY;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return EJBModule.class.isAssignableFrom(moduleType);
+ }
+
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
Sat Dec 5 06:24:26 2009
@@ -88,4 +88,12 @@
return null;
}
+ public int getPriority() {
+ return NORMAL_PRIORITY;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return WebModule.class.isAssignableFrom(moduleType);
+ }
+
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Sat Dec 5 06:24:26 2009
@@ -746,6 +746,14 @@
webModuleData.setReferencePattern("TrackedConnectionAssociator", moduleContext.getConnectionTrackerName());
}
+ public int getPriority() {
+ return 10;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return WebModule.class.isAssignableFrom(moduleType);
+ }
+
private static class InternWrapper implements XMLStreamReader {
private final XMLStreamReader delegate;
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Sat Dec 5 06:24:26
2009
@@ -28,9 +28,6 @@
<reference name="Repositories">
<!--<gbean-name>*:name=Repository,*</gbean-name>-->
</reference>
- <reference name="WebConfigBuilder">
- <name>WebBuilder</name>
- </reference>
<references name="ServiceBuilders">
<pattern>
<name>GBeanBuilder</name>
@@ -44,23 +41,21 @@
<name>PersistenceUnitBuilder</name>
</pattern>
</references>
- <references name="EJBConfigBuilder">
+ <references name="ModuleBuilders">
+ <pattern>
+ <name>WebBuilder</name>
+ </pattern>
<pattern>
<name>EJBBuilder</name>
</pattern>
<pattern>
- <name>UnavailableEJBBuilder</name>
+ <name>ConnectorBuilder</name>
</pattern>
- </references>
- <reference name="ConnectorConfigBuilder">
- <name>ConnectorBuilder</name>
- </reference>
- <references name="AppClientConfigBuilder">
<pattern>
<name>AppClientBuilder</name>
</pattern>
<pattern>
- <name>UnavailableAppClientBuilder</name>
+ <name>AriesAppBuilder</name>
</pattern>
</references>
<reference name="ArtifactResolvers">
@@ -82,6 +77,8 @@
<!-- web switching builder -->
<gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}</attribute>
+ <attribute name="supportedModule">org.apache.geronimo.j2ee.deployment.WebModule</attribute>
+ <attribute name="priority">10</attribute>
<references name="ModuleBuilders">
<pattern>
<name>JettyWebBuilder</name>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=887507&r1=887506&r2=887507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Sat Dec 5 06:24:26 2009
@@ -898,6 +898,14 @@
return new AbstractNameQuery(artifact, nameMap, (Set) null);
}
+ public int getPriority() {
+ return 20;
+ }
+
+ public boolean supportsModule(Class moduleType) {
+ return EjbModule.class.isAssignableFrom(moduleType);
+ }
+
public static class EarData {
private final Map<String, EjbModule> ejbModules = new TreeMap<String, EjbModule>();
private final Map<String, EjbJarInfo> ejbJars = new TreeMap<String, EjbJarInfo>();
Geronimo Revision: 887472 built with tests included See the full build-2000.log file at http://people.apache.org/builds/geronimo/server/binaries/2.2/20091204/build-2000.log Download the binaries from http://people.apache.org/builds/geronimo/server/binaries/2.2/20091204 [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 31 minutes 12 seconds [INFO] Finished at: Fri Dec 04 20:58:14 EST 2009 [INFO] Final Memory: 318M/805M [INFO] ------------------------------------------------------------------------ TESTSUITE RESULTS (Failures only) ================================= Assembly: tomcat ================================= See full test results and logs at http://people.apache.org/builds/geronimo/server/binaries/2.2/20091204/logs-2000-tomcat/ Assembly: jetty ================================= See full test results and logs at http://people.apache.org/builds/geronimo/server/binaries/2.2/20091204/logs-2000-jetty/ Samples: branches/2.2 ================================= Log: http://people.apache.org/builds/geronimo/server/binaries/2.2/20091204/samples-2000.log Build status: FAILED
Author: gawor
Date: Fri Dec 4 20:48:16 2009
New Revision: 887352
URL: http://svn.apache.org/viewvc?rev=887352&view=rev
Log:
GERONIMO-4971: temporary code that installs aries application bundles
Modified:
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java?rev=887352&r1=887351&r2=887352&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/AriesAppModuleBuilder.java
Fri Dec 4 20:48:16 2009
@@ -21,9 +21,15 @@
import java.io.InputStream;
import java.net.URI;
import java.net.URL;
+import java.util.