Codebase list openrefine-butterfly / 6aef590
New upstream version 1.2.3 Markus Koschany 2 years ago
8 changed file(s) with 27 addition(s) and 57 deletion(s). Raw diff Collapse all Expand all
+2
-1
main/appengine/WEB-INF/log4j.properties less more
11 log4j.logger.velocity=error
22
33 log4j.appender.console=org.apache.log4j.ConsoleAppender
4 log4j.appender.console.layout=org.apache.log4j.SimpleLayout
4 log4j.appender.console.layout=org.apache.log4j.PatternLayout
5 log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+10
-29
main/pom.xml less more
66 <parent>
77 <groupId>org.openrefine.dependencies</groupId>
88 <artifactId>butterfly-container</artifactId>
9 <version>1.2.0</version>
9 <version>1.2.3</version>
1010 </parent>
1111
1212 <groupId>org.openrefine.dependencies</groupId>
1313 <artifactId>butterfly</artifactId>
14 <version>1.2.0</version>
14 <version>1.2.3</version>
1515
1616 <name>SIMILE Butterfly Engine</name>
1717 <url>https://github.com/OpenRefine/simile-butterfly/</url>
6262
6363 <dependencies>
6464 <dependency>
65 <groupId>edu.mit.simile</groupId>
66 <artifactId>tracer</artifactId>
67 <version>1.0</version>
68 </dependency>
69 <dependency>
7065 <groupId>commons-collections</groupId>
7166 <artifactId>commons-collections</artifactId>
7267 <version>3.2.2</version>
8782 <version>1.6.3</version>
8883 </dependency>
8984 <dependency>
90 <groupId>rhino</groupId>
91 <artifactId>js</artifactId>
92 <version>1.7R2</version>
85 <groupId>org.mozilla</groupId>
86 <artifactId>rhino</artifactId>
87 <version>1.7.14-RC1</version>
9388 </dependency>
9489 <dependency>
9590 <groupId>javax.servlet</groupId>
107102 <version>1.7.32</version>
108103 </dependency>
109104 <dependency>
110 <groupId>org.slf4j</groupId>
111 <artifactId>slf4j-log4j12</artifactId>
112 <version>1.7.32</version>
113 </dependency>
114 <dependency>
115 <groupId>log4j</groupId>
116 <artifactId>log4j</artifactId>
117 <version>1.2.17</version>
118 <exclusions>
119 <exclusion>
120 <groupId>com.sun.jmx</groupId>
121 <artifactId>jmxri</artifactId>
122 </exclusion>
123 <exclusion>
124 <groupId>com.sun.jmx</groupId>
125 <artifactId>jmxtools</artifactId>
126 </exclusion>
127 </exclusions>
105 <groupId>org.apache.logging.log4j</groupId>
106 <artifactId>log4j-slf4j-impl</artifactId>
107 <version>${log4j.version}</version>
108 <scope>test</scope>
128109 </dependency>
129110 <dependency>
130111 <groupId>org.testng</groupId>
135116 <dependency>
136117 <groupId>org.mockito</groupId>
137118 <artifactId>mockito-core</artifactId>
138 <version>3.12.4</version>
119 <version>4.2.0</version>
139120 <scope>test</scope>
140121 </dependency>
141122 </dependencies>
+0
-13
main/src/edu/mit/simile/butterfly/Butterfly.java less more
3737 import javax.servlet.http.HttpServletResponse;
3838
3939 import org.apache.commons.collections.ExtendedProperties;
40 import org.apache.log4j.PropertyConfigurator;
4140 import org.apache.velocity.app.VelocityEngine;
4241 import org.apache.velocity.runtime.RuntimeConstants;
4342 import org.mozilla.javascript.Context;
247246
248247 _autoreload = _properties.getBoolean(AUTORELOAD, false);
249248
250 if (!_appengine) {
251 String log4j = System.getProperty("butterfly.log4j");
252 File logProperties = (log4j == null) ? new File(_webInfDir, "log4j.properties") : new File(log4j);
253 if (logProperties.exists()) {
254 if (_autoreload) {
255 PropertyConfigurator.configureAndWatch(logProperties.getAbsolutePath(), watcherDelay);
256 } else {
257 PropertyConfigurator.configure(logProperties.getAbsolutePath());
258 }
259 }
260 }
261
262249 _logger = LoggerFactory.getLogger(_name);
263250
264251 _logger.info("Starting {} ...", _name);
+0
-5
main/tests/src/edu/mit/simile/butterfly/tests/ButterflyTest.java less more
1313
1414 transient protected Logger logger;
1515
16 @BeforeSuite
17 public void init() {
18 System.setProperty("log4j.configuration", "tests.log4j.properties");
19 }
20
2116 protected HttpServletRequest getRequest(String scheme, String host, String requestURI, String pathInfo, String originalHost, String originalContext) {
2217 HttpServletRequest request = mock(HttpServletRequest.class);
2318 when(request.getScheme()).thenReturn(scheme);
+8
-0
main/tests/src/log4j2.properties less more
0 log4j.rootLogger=error, console
1 log4j.logger.butterfly=warn
2 log4j.logger.javascript=info
3 log4j.logger.Velocity=error
4
5 log4j.appender.console=ConsoleAppender
6 log4j.appender.console.layout=PatternLayout
7 log4j.appender.console.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+0
-7
main/tests/src/tests.log4j.properties less more
0 log4j.rootLogger=error, console
1 log4j.logger.butterfly=warn
2 log4j.logger.javascript=info
3 log4j.logger.Velocity=error
4
5 log4j.appender.console=org.apache.log4j.ConsoleAppender
6 log4j.appender.console.layout=edu.mit.simile.tracer.Tracer
+2
-1
main/webapp/WEB-INF/log4j.properties less more
33 log4j.logger.velocity=ERROR
44
55 log4j.appender.console=org.apache.log4j.ConsoleAppender
6 log4j.appender.console.layout=edu.mit.simile.tracer.Tracer
6 log4j.appender.console.layout=org.apache.log4j.PatternLayout
7 log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+5
-1
pom.xml less more
1111
1212 <groupId>org.openrefine.dependencies</groupId>
1313 <artifactId>butterfly-container</artifactId>
14 <version>1.2.0</version>
14 <version>1.2.3</version>
1515 <packaging>pom</packaging>
1616
1717 <name>SIMILE Butterfly</name>
5656 <modules>
5757 <module>main</module>
5858 </modules>
59
60 <properties>
61 <log4j.version>2.17.0</log4j.version>
62 </properties>
5963
6064 <scm>
6165 <connection>scm:git:https://github.com/OpenRefine/simile-butterfly.git</connection>