Skip to content

Commit

Permalink
PAYARA-1983 Fixed resource bundle error (#2005)
Browse files Browse the repository at this point in the history
* PAYARA-1983 Fixed resource bundle error

* Update RestMonitoringAdapter.java

* Update RestMonitoringAdapter.java
  • Loading branch information
michaelranaldo authored and smillidge committed Sep 21, 2017
1 parent ab1922f commit 4c466ee
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,15 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
# Copyright (c) [2017] Payara Foundation and/or its affiliates. All rights reserved.
#
# The contents of this file are subject to the terms of either the GNU
# General Public License Version 2 only ("GPL") or the Common Development
# and Distribution License("CDDL") (collectively, the "License"). You
# may not use this file except in compliance with the License. You can
# obtain a copy of the License at
# https://github.com/payara/Payara/blob/master/LICENSE.txt
# See the License for the specific
# language governing permissions and limitations under the License.
#
# When distributing the software, include this License Header Notice in each
# file and include the License file at glassfish/legal/LICENSE.txt.
#
# GPL Classpath Exception:
# The Payara Foundation designates this particular file as subject to the "Classpath"
# exception as provided by the Payara Foundation in the GPL Version 2 section of the License
# file that accompanied this code.
#
# Modifications:
# If applicable, add the following below the License Header, with the fields
# enclosed by brackets [] replaced by your own identifying information:
# "Portions Copyright [year] [name of copyright owner]"
#
# Contributor(s):
# If you wish your version of this file to be governed by only the CDDL or
# only the GPL Version 2, indicate your decision by adding "[Contributor]
# elects to include this software in this distribution under the [CDDL or GPL
# Version 2] license." If you don't indicate a single choice of license, a
# recipient has the option to distribute your version of this file under
# either the CDDL, the GPL Version 2 or to extend the choice of license to
# its licensees as provided above. However, if you add GPL Version 2 code
# and therefore, elected the GPL Version 2 license, then the option applies
# only if the new code is made subject to such option by the copyright
# holder.
#

http.bad.method = "method not allowed"
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public final class RestMonitoringAdapter extends HttpHandler implements Adapter
RestMonitoringConfiguration restMonitoringServiceConfiguration;

private final static Logger logger = Logger.getLogger(RestMonitoringAdapter.class.getName());
private final static String RESOURCE_PACKAGE = "fish/payara/appserver/monitoring/rest/adapter";
private final static String RESOURCE_PACKAGE = "fish/payara/appserver/monitoring/rest/service/adapter";
private final CountDownLatch latch = new CountDownLatch(1);

@PostConstruct
Expand Down Expand Up @@ -234,7 +234,7 @@ public void service(Request request, Response response) throws Exception {
}

private ResourceBundle getResourceBundle(Locale locale) {
return ResourceBundle.getBundle("com.sun.enterprise.v3.admin.adapter.LocalStrings", locale);
return ResourceBundle.getBundle(RestMonitoringAdapter.class.getPackage().getName() + ".LocalStrings", locale);
}

private boolean checkHttpMethodAllowed(Method method) {
Expand Down

0 comments on commit 4c466ee

Please sign in to comment.