You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/21 10:54:14 UTC
[tomcat] branch 8.5.x updated (acd0cc3 -> 4815be4)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from acd0cc3 Log a warning if addind CredentialHandler to CombinedRealm
new e5cf33b Add missing JARs. Patch provided by Brian Burch.
new 4815be4 Fix saving of context.xml file from Manager app
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../catalina/manager/LocalStrings.properties | 1 +
.../apache/catalina/manager/ManagerServlet.java | 11 +++++---
.../apache/catalina/storeconfig/StoreConfig.java | 31 +++++++++-------------
.../catalina/storeconfig/mbeans-descriptors.xml | 2 +-
.../netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
webapps/docs/changelog.xml | 12 +++++++++
7 files changed, 36 insertions(+), 25 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix saving of context.xml file from Manager app
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4815be414ab82af37fca351422b9af82a175aa15
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 21 11:50:51 2020 +0100
Fix saving of context.xml file from Manager app
---
.../catalina/manager/LocalStrings.properties | 1 +
.../apache/catalina/manager/ManagerServlet.java | 11 +++++---
.../apache/catalina/storeconfig/StoreConfig.java | 31 +++++++++-------------
.../catalina/storeconfig/mbeans-descriptors.xml | 2 +-
webapps/docs/changelog.xml | 8 ++++++
5 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index 34a63a5..91c3697 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -150,6 +150,7 @@ managerServlet.resourcesType=OK - Listed global resources of type [{0}]
managerServlet.saveFail=FAIL - Configuration save failed: [{0}]
managerServlet.saved=OK - Server configuration saved
managerServlet.savedContext=OK - Context [{0}] configuration saved
+managerServlet.savedContextFail=FAIL - Context [{0}] configuration save failed
managerServlet.serverInfo=OK - Server info\n\
Tomcat Version: [{0}]\n\
OS Name: [{1}]\n\
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java
index 73f3593..41ca512 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -703,11 +703,14 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet {
return;
}
try {
- mBeanServer.invoke(storeConfigOname, "store",
+ Boolean result = (Boolean) mBeanServer.invoke(storeConfigOname, "store",
new Object[] {context},
- new String [] { "java.lang.String"});
- writer.println(smClient.getString("managerServlet.savedContext",
- path));
+ new String [] { "org.apache.catalina.Context"});
+ if (result.booleanValue()) {
+ writer.println(smClient.getString("managerServlet.savedContext", path));
+ } else {
+ writer.println(smClient.getString("managerServlet.savedContextFail", path));
+ }
} catch (Exception e) {
log("managerServlet.save[" + path + "]", e);
writer.println(smClient.getString("managerServlet.exception",
diff --git a/java/org/apache/catalina/storeconfig/StoreConfig.java b/java/org/apache/catalina/storeconfig/StoreConfig.java
index 8a0fcad..0f0ddcd 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfig.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfig.java
@@ -253,26 +253,21 @@ public class StoreConfig implements IStoreConfig {
*/
@Override
public synchronized boolean store(Context aContext) {
- URL configFile = aContext.getConfigFile();
- if (configFile != null) {
- try {
- StoreDescription desc = null;
- desc = getRegistry().findDescription(aContext.getClass());
- if (desc != null) {
- boolean old = desc.isStoreSeparate();
- try {
- desc.setStoreSeparate(true);
- desc.getStoreFactory().store(null, -2, aContext);
- } finally {
- desc.setStoreSeparate(old);
- }
+ try {
+ StoreDescription desc = null;
+ desc = getRegistry().findDescription(aContext.getClass());
+ if (desc != null) {
+ boolean old = desc.isStoreSeparate();
+ try {
+ desc.setStoreSeparate(true);
+ desc.getStoreFactory().store(null, -2, aContext);
+ } finally {
+ desc.setStoreSeparate(old);
}
- return true;
- } catch (Exception e) {
- log.error(sm.getString("config.storeContextError", aContext.getName()), e);
}
- } else {
- log.error("Missing configFile at Context " + aContext.getPath());
+ return true;
+ } catch (Exception e) {
+ log.error(sm.getString("config.storeContextError", aContext.getName()), e);
}
return false;
}
diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
index bec2fc2..f0f402d 100644
--- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
@@ -70,7 +70,7 @@
impact="ACTION" returnType="void" >
<parameter name="context"
description="Context"
- type="org.apache.catalina.context"/>
+ type="org.apache.catalina.Context"/>
</operation>
<operation name="store"
description="Store Host"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eadcc1f..a36aebc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -91,6 +91,14 @@
</update>
</changelog>
</subsection>
+ <subseciton name="Web applications">
+ <changelog>
+ <fix>
+ Fix the saving of a Context configuration file via the scripting
+ interface of the Manager web application. (markt)
+ </fix>
+ </changelog>
+ </subseciton>
<subsection name="Other">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Add missing JARs. Patch provided by Brian Burch.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e5cf33b8ab264368f523d08af5d84bddbaa989b0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 21 10:05:45 2020 +0100
Add missing JARs. Patch provided by Brian Burch.
---
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
webapps/docs/changelog.xml | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties b/res/ide-support/netbeans/nb-tomcat-build.properties
index 7e083e6..336306a 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml b/res/ide-support/netbeans/project.xml
index 609766b..f4c25ee 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
<compilation-unit>
<package-root>test</package-root>
<unit-tests/>
- <classpath mode="compile">output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar</classpath>
+ <classpath mode="compile">output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/objenesis-1.2/objenesis-1.2.jar:${base.path}/cglib-2.2.2/cglib-nodep-2.2.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar</classpath>
<source-level>1.7</source-level>
</compilation-unit>
</java-data>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a9e8226..eadcc1f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -96,6 +96,10 @@
<update>
Update JUnit to version 4.13. (markt)
</update>
+ <fix>
+ Add missing entries to test class path in sample NetBeans configuration
+ files. Patch provided by Brian Burch. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org