To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit 456decc1 authored by Rui Chen's avatar Rui Chen
Browse files

[Daytrader]Updated the patch files for daytrader and geronimo

parent 1c179885
This diff is collapsed.
--- geronimo-jetty6-javaee5-2.1.4-clean/var/log/server-log4j.properties 2009-06-13 20:12:09.000000000 +1000 diff -urNw geronimo-tomcat7-minimal-3.0.1/etc/config.properties geronimo-tomcat7-minimal-3.0.1-new/etc/config.properties
+++ geronimo-jetty6-minimal-2.1.4/var/log/server-log4j.properties 2009-06-13 20:12:27.000000000 +1000 --- geronimo-tomcat7-minimal-3.0.1/etc/config.properties 2013-05-23 13:54:41.000000000 +1000
+++ geronimo-tomcat7-minimal-3.0.1-new/etc/config.properties 2018-03-04 21:43:49.190137595 +1100
@@ -260,7 +260,7 @@
# Standard package set. Note that:
# - javax.transaction* is exported with a mandatory attribute
-jre-1.7=, \
+jre-1.8=, \
javax.accessibility, \
javax.activity, \
javax.annotation.processing, \
diff -urNw geronimo-tomcat7-minimal-3.0.1/var/log/client-log4j.properties geronimo-tomcat7-minimal-3.0.1-new/var/log/client-log4j.properties
--- geronimo-tomcat7-minimal-3.0.1/var/log/client-log4j.properties 2013-05-23 13:54:41.000000000 +1000
+++ geronimo-tomcat7-minimal-3.0.1-new/var/log/client-log4j.properties 2018-03-04 21:44:13.117695904 +1100
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
log4j.rootLogger=INFO, CONSOLE, FILE log4j.rootLogger=INFO, CONSOLE, FILE
...@@ -9,8 +22,9 @@ ...@@ -9,8 +22,9 @@
log4j.appender.CONSOLE.Target=System.out log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n
--- geronimo-jetty6-javaee5-2.1.4-clean/var/log/client-log4j.properties 2009-06-13 20:12:09.000000000 +1000 diff -urNw geronimo-tomcat7-minimal-3.0.1/var/log/server-log4j.properties geronimo-tomcat7-minimal-3.0.1-new/var/log/server-log4j.properties
+++ geronimo-jetty6-minimal-2.1.4/var/log/client-log4j.properties 2009-06-13 20:12:27.000000000 +1000 --- geronimo-tomcat7-minimal-3.0.1/var/log/server-log4j.properties 2013-05-23 13:54:41.000000000 +1000
+++ geronimo-tomcat7-minimal-3.0.1-new/var/log/server-log4j.properties 2018-03-04 21:44:55.172919801 +1100
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
log4j.rootLogger=INFO, CONSOLE, FILE log4j.rootLogger=INFO, CONSOLE, FILE
...@@ -20,32 +34,3 @@ ...@@ -20,32 +34,3 @@
log4j.appender.CONSOLE.Target=System.out log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n
--- plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java 2018-01-02 15:54:45.000000000 +1100
+++ ../CXFEndpoint.java 2018-01-03 13:02:55.000000000 +1100
@@ -31,6 +31,8 @@
import javax.xml.ws.handler.Handler;
import javax.xml.ws.http.HTTPBinding;
import javax.xml.ws.soap.SOAPBinding;
+import javax.xml.ws.EndpointReference;
+import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Server;
@@ -262,4 +264,15 @@
this.server.stop();
}
}
+
+ @Override
+ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
+ Element... referenceParameters){
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public EndpointReference getEndpointReference(Element... referenceParameters){
+ throw new UnsupportedOperationException();
+ }
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment