Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

change some javadocs and method visibility

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@781447 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Musachy Barroso
2009-06-03 15:59:27 +00:00
parent 47fa0c6635
commit db349486d7
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+15 -12
View File
@@ -141,6 +141,10 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
this.devMode = "true".equals(mode);
}
/**
* Reload configuration when classes change. Defaults to "false" and should not be used
* in production.
*/
@Inject("struts.convention.classes.reload")
public void setReload(String reload) {
this.reload = "true".equals(reload);
@@ -266,7 +270,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
reloadingClassLoader = new ReloadingClassLoader(getClassLoader());
}
private ClassLoader getClassLoader() {
protected ClassLoader getClassLoader() {
return Thread.currentThread().getContextClassLoader();
}
@@ -293,15 +297,12 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
if (LOG.isTraceEnabled()) {
LOG.trace("Loading action configurations");
if (actionPackages != null) {
if (actionPackages != null)
LOG.trace("Actions being loaded from action packages " + Arrays.asList(actionPackages));
}
if (packageLocators != null) {
if (packageLocators != null)
LOG.trace("Actions being loaded using package locators " + Arrays.asList(packageLocators));
}
if (excludePackages != null) {
if (excludePackages != null)
LOG.trace("Excluding actions from packages " + Arrays.asList(excludePackages));
}
}
Set<Class> classes = findActions();
@@ -319,7 +320,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
thread classloader)
using this, other plugins (like OSGi) can plugin their own classloader for a while
and it will be used by Convention (it cannot be a bean, as Convention is likely to be
called multiple times, and it need to use the default ClassLoaderInterface during normal startup)
called multiple times, and it needs to use the default ClassLoaderInterface during normal startup)
*/
ClassLoaderInterface classLoaderInterface = null;
ActionContext ctx = ActionContext.getContext();
@@ -385,7 +386,8 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
urlSet = urlSet.exclude(new ClassLoaderInterfaceDelegate(systemClassLoader.getParent()));
} catch (SecurityException e) {
LOG.warn("Could not get the system classloader due to security constraints, there may be improper urls left to scan");
if (LOG.isWarnEnabled())
LOG.warn("Could not get the system classloader due to security constraints, there may be improper urls left to scan");
}
urlSet = urlSet.excludeJavaExtDirs();
urlSet = urlSet.excludeJavaEndorsedDirs();
@@ -393,7 +395,8 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
urlSet = urlSet.excludeJavaHome();
} catch (NullPointerException e) {
// This happens in GAE since the sandbox contains no java.home directory
LOG.warn("Could not exclude JAVA_HOME, is this a sandbox jvm?");
if (LOG.isWarnEnabled())
LOG.warn("Could not exclude JAVA_HOME, is this a sandbox jvm?");
}
urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", ""));
urlSet = urlSet.exclude(".*/JavaVM.framework/.*");
@@ -813,7 +816,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
}
}
private List<ExceptionMappingConfig> buildExceptionMappings(ExceptionMapping[] exceptions, String actionName) {
protected List<ExceptionMappingConfig> buildExceptionMappings(ExceptionMapping[] exceptions, String actionName) {
List<ExceptionMappingConfig> exceptionMappings = new ArrayList<ExceptionMappingConfig>();
for (ExceptionMapping exceptionMapping : exceptions) {
@@ -830,7 +833,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
return exceptionMappings;
}
private PackageConfig.Builder getPackageConfig(final Map<String, PackageConfig.Builder> packageConfigs,
protected PackageConfig.Builder getPackageConfig(final Map<String, PackageConfig.Builder> packageConfigs,
String actionNamespace, final String actionPackage, final Class<?> actionClass,
Action action) {
if (action != null && !action.value().equals(Action.DEFAULT_VALUE)) {
plugins/convention/src/main/java/org/apache/struts2/convention/classloader/ReloadingClassLoader.java
+2 -2
View File
@@ -56,7 +56,7 @@ public class ReloadingClassLoader extends ClassLoader {
} catch (RuntimeException e) {
// see WW-3121
// TODO: Fix this for a reloading mechanism to be marked as stable
LOG.error("Exception while trying to build the ResourceStore for URL " + root.toString(), e);
LOG.error("Exception while trying to build the ResourceStore for URL [#0]", e, root.toString());
LOG.error("Consider setting struts.convention.classes.reload=false");
throw e;
}
@@ -74,7 +74,7 @@ public class ReloadingClassLoader extends ClassLoader {
delegate = new ResourceStoreClassLoader(parent, stores);
return true;
} catch (final RuntimeException e) {
LOG.error("could not add resource store " + pStore);
LOG.error("Could not add resource store", e);
}
return false;
}