You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/08/07 07:43:18 UTC
[1/3] git commit: Removes duplicated logging lib
Repository: struts
Updated Branches:
refs/heads/develop ae324c981 -> dfb2bd3db
Removes duplicated logging lib
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a2ba908f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a2ba908f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a2ba908f
Branch: refs/heads/develop
Commit: a2ba908fa7181e5a63c8bf14cfe9a3c635cfdbc6
Parents: ae324c9
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Aug 7 07:41:17 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Aug 7 07:41:17 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a2ba908f/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 675de3f..83bec60 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -48,11 +48,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
[2/3] git commit: Adds proper logging dependency and configuration
Posted by lu...@apache.org.
Adds proper logging dependency and configuration
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f1861adf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f1861adf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f1861adf
Branch: refs/heads/develop
Commit: f1861adff40e6c0784584cb8178db8c8eb0e04ec
Parents: a2ba908
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Aug 7 07:42:15 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Aug 7 07:42:15 2014 +0200
----------------------------------------------------------------------
apps/rest-showcase/pom.xml | 4 ++++
apps/rest-showcase/src/main/resources/log4j.properties | 13 +++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f1861adf/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 4d9507e..965b0d1 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -49,6 +49,10 @@
<artifactId>struts2-config-browser-plugin</artifactId>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/struts/blob/f1861adf/apps/rest-showcase/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/src/main/resources/log4j.properties b/apps/rest-showcase/src/main/resources/log4j.properties
index a29a304..3c5af7c 100644
--- a/apps/rest-showcase/src/main/resources/log4j.properties
+++ b/apps/rest-showcase/src/main/resources/log4j.properties
@@ -11,19 +11,16 @@
# Set root logger level to WARN and append to stdout
-log4j.rootLogger=WARN, stdout
-
+log4j.rootLogger=INFO, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
# Pattern to output the caller's file name and line number.
log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
# Print only messages of level ERROR or above in the package noModule.
-log4j.logger.noModule=ERROR
-
-# OpenSymphony Stuff
-log4j.logger.com.opensymphony=INFO
+log4j.logger.noModule=FATAL
-# Struts2 Stuff
-log4j.logger.org.apache.struts2=INFO
+log4j.logger.com.opensymphony.xwork2=DEBUG
+log4j.logger.org.apache.struts2=DEBUG
[3/3] git commit: WW-4055 Includes all jars by default
Posted by lu...@apache.org.
WW-4055 Includes all jars by default
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dfb2bd3d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dfb2bd3d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dfb2bd3d
Branch: refs/heads/develop
Commit: dfb2bd3dbe8750ea9d98934cc5df1b61cac3516a
Parents: f1861ad
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Aug 7 07:42:58 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Aug 7 07:42:58 2014 +0200
----------------------------------------------------------------------
.../PackageBasedActionConfigBuilder.java | 53 +++++++++-----------
1 file changed, 23 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/dfb2bd3d/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
----------------------------------------------------------------------
diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
index b9b1a25..f6a43a8 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
@@ -93,7 +93,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
private String[] actionPackages;
private String[] excludePackages;
private String[] packageLocators;
- private String[] includeJars;
+ private String[] includeJars = new String[] { ".*?\\.jar(!/|/)?" };
private String packageLocatorsBasePackage;
private boolean disableActionScanning = false;
private boolean disablePackageLocatorsScanning = false;
@@ -458,42 +458,35 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", ""));
urlSet = urlSet.exclude(".*/JavaVM.framework/.*");
- if (includeJars == null) {
- urlSet = urlSet.exclude(".*?\\.jar(!/|/)?");
- } else {
- //jar urls regexes were specified
- List<URL> rawIncludedUrls = urlSet.getUrls();
- Set<URL> includeUrls = new HashSet<URL>();
- boolean[] patternUsed = new boolean[includeJars.length];
-
- for (URL url : rawIncludedUrls) {
- if (fileProtocols.contains(url.getProtocol())) {
- //it is a jar file, make sure it macthes at least a url regex
- for (int i = 0; i < includeJars.length; i++) {
- String includeJar = includeJars[i];
- if (Pattern.matches(includeJar, url.toExternalForm())) {
- includeUrls.add(url);
- patternUsed[i] = true;
- break;
- }
+ List<URL> rawIncludedUrls = urlSet.getUrls();
+ Set<URL> includeUrls = new HashSet<URL>();
+ boolean[] patternUsed = new boolean[includeJars.length];
+
+ for (URL url : rawIncludedUrls) {
+ if (fileProtocols.contains(url.getProtocol())) {
+ //it is a jar file, make sure it macthes at least a url regex
+ for (int i = 0; i < includeJars.length; i++) {
+ String includeJar = includeJars[i];
+ if (Pattern.matches(includeJar, url.toExternalForm())) {
+ includeUrls.add(url);
+ patternUsed[i] = true;
+ break;
}
- } else {
- //it is not a jar
- includeUrls.add(url);
}
+ } else {
+ //it is not a jar
+ includeUrls.add(url);
}
+ }
- if (LOG.isWarnEnabled()) {
- for (int i = 0; i < patternUsed.length; i++) {
- if (!patternUsed[i]) {
- LOG.warn("The includeJars pattern [#0] did not match any jars in the classpath", includeJars[i]);
- }
+ if (LOG.isWarnEnabled()) {
+ for (int i = 0; i < patternUsed.length; i++) {
+ if (!patternUsed[i]) {
+ LOG.warn("The includeJars pattern [#0] did not match any jars in the classpath", includeJars[i]);
}
}
- return new UrlSet(includeUrls);
}
-
- return urlSet;
+ return new UrlSet(includeUrls);
}
/**