db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1830975 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/lastgoodjarcontents/ client/ client/org/apache/derby/loc/ client/org/apache/derby/loc/client/ shared/ shared/org/apache/derby/loc/ shared/org/apache/derby/loc/client/ shar...
Date Sat, 05 May 2018 13:51:44 GMT
Author: rhillegas
Date: Sat May  5 13:51:44 2018
New Revision: 1830975

URL: http://svn.apache.org/viewvc?rev=1830975&view=rev
Log:
DERBY-6945: Add a ResourceBundleProvider for the client messages so that they can be found
when Derby is run using a modulepath; commit derby-6945-31-aa-clientmessages-ResourceBundleProvider.diff.

Added:
    db/derby/code/trunk/java/client/org/apache/derby/loc/
    db/derby/code/trunk/java/client/org/apache/derby/loc/client/
    db/derby/code/trunk/java/client/org/apache/derby/loc/client/clientmessagesProviderImpl.java
  (with props)
    db/derby/code/trunk/java/shared/org/apache/derby/loc/
    db/derby/code/trunk/java/shared/org/apache/derby/loc/client/
    db/derby/code/trunk/java/shared/org/apache/derby/loc/client/spi/
    db/derby/code/trunk/java/shared/org/apache/derby/loc/client/spi/clientmessagesProvider.java
  (with props)
Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents
    db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
    db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
    db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
    db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents
    db/derby/code/trunk/java/client/module-info.java
    db/derby/code/trunk/java/shared/module-info.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents?rev=1830975&r1=1830974&r2=1830975&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents
(original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyTesting.jar.lastcontents
Sat May  5 13:51:44 2018
@@ -1,14 +1,3 @@
-SimpleApp.class
-WwdClientExample.class
-WwdEmbedded.class
-WwdUtils.class
-org.apache.derbyDemo.vtis.core.FlatFileVTI.class
-org.apache.derbyDemo.vtis.example.ApacheServerLogVTI.class
-org.apache.derbyDemo.vtis.example.DerbyJiraReportVTI.class
-org.apache.derbyDemo.vtis.example.LineListVTI.class
-org.apache.derbyDemo.vtis.example.PropertyFileVTI.class
-org.apache.derbyDemo.vtis.example.SubversionLogVTI.class
-toursdb.insertMaps.class
 org.apache.derbyTesting.functionTests.harness.BackgroundStreamDrainer.class
 org.apache.derbyTesting.functionTests.harness.BackgroundStreamSaver.class
 org.apache.derbyTesting.functionTests.harness.CopySuppFiles.class
@@ -1037,3 +1026,4 @@ org.apache.derbyTesting.unitTests.store.
 org.apache.derbyTesting.unitTests.store.commit_method.class
 org.apache.derbyTesting.unitTests.util.BitUtil.class
 org.apache.derbyTesting.unitTests.util.MsgTrace.class
+toursdb.insertMaps.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents?rev=1830975&r1=1830974&r2=1830975&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
(original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
Sat May  5 13:51:44 2018
@@ -142,3 +142,4 @@ org.apache.derby.client.net.StatementRep
 org.apache.derby.client.net.StatementRequestInterface.class
 org.apache.derby.client.net.Typdef.class
 org.apache.derby.client.net.Utf8CcsidManager.class
+org.apache.derby.loc.client.clientmessagesProviderImpl.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents?rev=1830975&r1=1830974&r2=1830975&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
(original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
Sat May  5 13:51:44 2018
@@ -1,14 +1,3 @@
-SimpleApp.class
-WwdClientExample.class
-WwdEmbedded.class
-WwdUtils.class
-org.apache.derbyDemo.vtis.core.FlatFileVTI.class
-org.apache.derbyDemo.vtis.example.ApacheServerLogVTI.class
-org.apache.derbyDemo.vtis.example.DerbyJiraReportVTI.class
-org.apache.derbyDemo.vtis.example.LineListVTI.class
-org.apache.derbyDemo.vtis.example.PropertyFileVTI.class
-org.apache.derbyDemo.vtis.example.SubversionLogVTI.class
-toursdb.insertMaps.class
 org.apache.derbyTesting.functionTests.harness.BackgroundStreamDrainer.class
 org.apache.derbyTesting.functionTests.harness.BackgroundStreamSaver.class
 org.apache.derbyTesting.functionTests.harness.CopySuppFiles.class
@@ -1037,3 +1026,4 @@ org.apache.derbyTesting.unitTests.store.
 org.apache.derbyTesting.unitTests.store.commit_method.class
 org.apache.derbyTesting.unitTests.util.BitUtil.class
 org.apache.derbyTesting.unitTests.util.MsgTrace.class
+toursdb.insertMaps.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents?rev=1830975&r1=1830974&r2=1830975&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
(original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
Sat May  5 13:51:44 2018
@@ -142,3 +142,4 @@ org.apache.derby.client.net.StatementRep
 org.apache.derby.client.net.StatementRequestInterface.class
 org.apache.derby.client.net.Typdef.class
 org.apache.derby.client.net.Utf8CcsidManager.class
+org.apache.derby.loc.client.clientmessagesProviderImpl.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents?rev=1830975&r1=1830974&r2=1830975&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents
(original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbytools.jar.lastcontents
Sat May  5 13:51:44 2018
@@ -81,6 +81,7 @@ org.apache.derby.jdbc.EmbeddedDriver.cla
 org.apache.derby.jdbc.EmbeddedXADataSource.class
 org.apache.derby.jdbc.EmbeddedXADataSource40.class
 org.apache.derby.jdbc.ReferenceableDataSource.class
+org.apache.derby.loc.tools.toolsmessagesProviderImpl.class
 org.apache.derby.tools.JDBCDisplayUtil.class
 org.apache.derby.tools.PlanExporter.class
 org.apache.derby.tools.SignatureChecker.class

Modified: db/derby/code/trunk/java/client/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/module-info.java?rev=1830975&r1=1830974&r2=1830975&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/module-info.java (original)
+++ db/derby/code/trunk/java/client/module-info.java Sat May  5 13:51:44 2018
@@ -20,6 +20,12 @@ module org.apache.derby.client
     requires static java.naming;
 
     //
+    // PUBLISH THE CLIENT MESSAGE LOCALIZATIONS.
+    //
+    provides org.apache.derby.loc.client.spi.clientmessagesProvider
+        with org.apache.derby.loc.client.clientmessagesProviderImpl;
+
+    //
     // DERBY INTERNAL EXPORTS
     //
     // ONLY VISIBLE TO OTHER DERBY MODULES.

Added: db/derby/code/trunk/java/client/org/apache/derby/loc/client/clientmessagesProviderImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/loc/client/clientmessagesProviderImpl.java?rev=1830975&view=auto
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/loc/client/clientmessagesProviderImpl.java
(added)
+++ db/derby/code/trunk/java/client/org/apache/derby/loc/client/clientmessagesProviderImpl.java
Sat May  5 13:51:44 2018
@@ -0,0 +1,36 @@
+/*
+
+   Derby - Class org.apache.derby.loc.client.clientmessagesProviderImpl
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derby.loc.client;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.apache.derby.loc.client.spi.clientmessagesProvider;
+
+public class clientmessagesProviderImpl implements clientmessagesProvider
+{
+    public ResourceBundle getBundle​(String baseName, Locale locale)
+    {
+        ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale);
+        return bundle;
+    }
+}

Propchange: db/derby/code/trunk/java/client/org/apache/derby/loc/client/clientmessagesProviderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/shared/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/module-info.java?rev=1830975&r1=1830974&r2=1830975&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/module-info.java (original)
+++ db/derby/code/trunk/java/shared/module-info.java Sat May  5 13:51:44 2018
@@ -7,10 +7,19 @@ module org.apache.derby.commons
     requires java.sql;
 
     //
+    // FOR LOADING MESSAGE LOCALIZATIONS FROM
+    // OTHER MODULES.
+    //
+    uses org.apache.derby.loc.client.spi.clientmessagesProvider;
+
+    //
     // DERBY INTERNAL EXPORTS
     //
     // ONLY VISIBLE TO OTHER DERBY MODULES.
     //
+    exports org.apache.derby.loc.client.spi to
+        org.apache.derby.client;
+
     exports org.apache.derby.shared.common.drda to
         org.apache.derby.client,
         org.apache.derby.server,

Added: db/derby/code/trunk/java/shared/org/apache/derby/loc/client/spi/clientmessagesProvider.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/loc/client/spi/clientmessagesProvider.java?rev=1830975&view=auto
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/loc/client/spi/clientmessagesProvider.java
(added)
+++ db/derby/code/trunk/java/shared/org/apache/derby/loc/client/spi/clientmessagesProvider.java
Sat May  5 13:51:44 2018
@@ -0,0 +1,26 @@
+/*
+
+   Derby - Class org.apache.derby.loc.client.spi.clientmessagesProvider
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derby.loc.client.spi;
+
+import java.util.spi.ResourceBundleProvider;
+
+public interface clientmessagesProvider extends ResourceBundleProvider {}

Propchange: db/derby/code/trunk/java/shared/org/apache/derby/loc/client/spi/clientmessagesProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message