Author: rmannibucau
Date: Sat Jul 26 08:03:43 2014
New Revision: 1613570
URL: http://svn.apache.org/r1613570
Log:
style
Modified:
tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml?rev=1613570&r1=1613569&r2=1613570&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml Sat Jul 26 08:03:43
2014
@@ -94,6 +94,9 @@
<id>apache-m2-snapshot</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
<repository>
<id>prime-repo</id>
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java?rev=1613570&r1=1613569&r2=1613570&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEERealm.java
Sat Jul 26 08:03:43 2014
@@ -29,9 +29,7 @@ import java.security.Principal;
import java.security.cert.X509Certificate;
public class TomEERealm extends CombinedRealm {
- private static final String INFO = TomEERealm.class.getName() + "/1.0";
-
- private final ThreadLocal<Request> requests = new ThreadLocal<Request>();
+ private final ThreadLocal<Request> requests = new ThreadLocal<>();
@Override
public Principal authenticate(final String username, final String
password) {
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1613570&r1=1613569&r2=1613570&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Sat Jul 26 08:03:43 2014
@@ -1707,7 +1707,6 @@ public class TomcatWebAppBuilder impleme
final String contextPath =
standardContext.getServletContext().getContextPath();
final String name = contextPath.isEmpty() ? "ROOT" :
contextPath.substring(1);
final String webResources =
SystemInstance.get().getProperty("tomee." + name + ".docBases",
contextInfo.appInfo.properties.getProperty("docBases"));
- final String cache = SystemInstance.get().getProperty("tomee." +
name + ".docBases.cache",
contextInfo.appInfo.properties.getProperty("docBases.cache"));
if (webResources != null) {
for (final String alt : webResources.trim().split(",")) {
final String trim = alt.trim();
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java?rev=1613570&r1=1613569&r2=1613570&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
Sat Jul 26 08:03:43 2014
@@ -52,7 +52,6 @@ public class LowTypedRealm implements Re
private static final Class<?>[] HAS_USER_DATA_PERMISSION_CONSTRAINT = new
Class<?>[] { HttpServletRequest.class, HttpServletResponse.class,
Object[].class };
private final Object delegate;
- private final String info;
private final Method simpleAuthenticateMethod;
private final Method authenticateMethod;
@@ -67,7 +66,6 @@ public class LowTypedRealm implements Re
public LowTypedRealm(final Object delegate) {
this.delegate = delegate;
- info = delegate.getClass() + "/1.0";
final Class<?> clazz = delegate.getClass();
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java?rev=1613570&r1=1613569&r2=1613570&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/remote/TomEERemoteWebapp.java
Sat Jul 26 08:03:43 2014
@@ -121,8 +121,6 @@ public class TomEERemoteWebapp extends I
// mainly for StandardContext.setClassLoaderProperty() otherwise
OpenEJB.class.getClassLoader() would be fine
public static class FakeWebAppLoader extends URLClassLoader {
- private final ClassLoader delegate;
-
// ignored but validated by tomcat, avoid warnings
private boolean clearReferencesHttpClientKeepAliveThread;
private boolean clearReferencesStopThreads;
@@ -131,23 +129,38 @@ public class TomEERemoteWebapp extends I
public FakeWebAppLoader(final ClassLoader classLoader) {
super(new URL[0], classLoader);
- delegate = classLoader;
}
- public void setClearReferencesHttpClientKeepAliveThread(final boolean
ignored) {
- // no-op
+ public boolean isClearReferencesHttpClientKeepAliveThread() {
+ return clearReferencesHttpClientKeepAliveThread;
+ }
+
+ public void setClearReferencesHttpClientKeepAliveThread(final boolean
clearReferencesHttpClientKeepAliveThread) {
+ this.clearReferencesHttpClientKeepAliveThread =
clearReferencesHttpClientKeepAliveThread;
+ }
+
+ public boolean isClearReferencesStopThreads() {
+ return clearReferencesStopThreads;
+ }
+
+ public void setClearReferencesStopThreads(final boolean
clearReferencesStopThreads) {
+ this.clearReferencesStopThreads = clearReferencesStopThreads;
+ }
+
+ public boolean isClearReferencesStopTimerThreads() {
+ return clearReferencesStopTimerThreads;
}
- public void setClearReferencesStopThreads(final boolean ignored) {
- // no-op
+ public void setClearReferencesStopTimerThreads(final boolean
clearReferencesStopTimerThreads) {
+ this.clearReferencesStopTimerThreads =
clearReferencesStopTimerThreads;
}
- public void setClearReferencesStopTimerThreads(final boolean ignored) {
- // no-op
+ public boolean isClearReferencesStatic() {
+ return clearReferencesStatic;
}
- public void setClearReferencesStatic(final boolean ignored) {
- // no-op
+ public void setClearReferencesStatic(final boolean
clearReferencesStatic) {
+ this.clearReferencesStatic = clearReferencesStatic;
}
}
}
