Author: rmannibucau
Date: Fri Jul 25 06:05:08 2014
New Revision: 1613353
URL: http://svn.apache.org/r1613353
Log:
style + repo of deltaspike-fullstack + new tomcat api in TomcatHessianRegistry
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml
tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1613353&r1=1613352&r2=1613353&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
Fri Jul 25 06:05:08 2014
@@ -36,7 +36,6 @@ import org.apache.openejb.loader.Files;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.ProvisioningUtil;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1613353&r1=1613352&r2=1613353&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Fri Jul 25 06:05:08 2014
@@ -98,7 +98,6 @@ import org.apache.xbean.finder.MetaAnnot
import org.apache.xbean.finder.ResourceFinder;
import javax.ejb.embeddable.EJBContainer;
-import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml?rev=1613353&r1=1613352&r2=1613353&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml Fri Jul 25 06:05:08
2014
@@ -97,9 +97,9 @@
<layout>default</layout>
</repository>
<repository>
- <id>apache-m2</id>
- <name>Apache M2 Repository</name>
- <url>https://repository.apache.org/content/repositories/releases/</url>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
</repository>
</repositories>
Modified:
tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java?rev=1613353&r1=1613352&r2=1613353&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java
(original)
+++
tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/TomcatHessianRegistry.java
Fri Jul 25 06:05:08 2014
@@ -31,14 +31,14 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.deploy.SecurityCollection;
-import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.openejb.assembler.classic.WebAppBuilder;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.httpd.util.HttpUtil;
+import org.apache.tomcat.util.descriptor.web.LoginConfig;
+import org.apache.tomcat.util.descriptor.web.SecurityCollection;
+import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
import org.apache.tomee.catalina.IgnoredStandardContext;
import org.apache.tomee.catalina.OpenEJBValve;
import org.apache.tomee.catalina.TomcatWebAppBuilder;
@@ -57,7 +57,7 @@ import java.util.Map;
public class TomcatHessianRegistry implements HessianRegistry {
private static final String TOMEE_HESSIAN_SECURITY_ROLE_PREFIX =
"tomee.hessian.security-role.";
- private final Map<String, Pair<Context, Integer>> fakeContexts = new
HashMap<String, Pair<Context, Integer>>();
+ private final Map<String, Pair<Context, Integer>> fakeContexts = new
HashMap<>();
private Engine engine;
private List<Connector> connectors;
@@ -82,7 +82,7 @@ public class TomcatHessianRegistry imple
if (host == null) {
host = engine.findChild(engine.getDefaultHost());
if (host == null) {
- throw new IllegalArgumentException("Invalid virtual host '" +
host + "'. Do you have a matchiing Host entry in the server.xml?");
+ throw new IllegalArgumentException("Invalid virtual host '" +
engine.getDefaultHost() + "'. Do you have a matchiing Host entry in the
server.xml?");
}
}
@@ -99,7 +99,7 @@ public class TomcatHessianRegistry imple
fakeContext = fakeContexts.get(contextRoot);
if (fakeContext == null) {
context = createNewContext(loader, authMethod,
transportGuarantee, realmName, app);
- fakeContext = new MutablePair<Context,
Integer>(context, 1);
+ fakeContext = new MutablePair<>(context, 1);
fakeContexts.put(contextRoot, fakeContext);
} else {
context = fakeContext.getLeft();
@@ -133,11 +133,11 @@ public class TomcatHessianRegistry imple
}
}
if (!found) {
- standardContext.addValve(new LimitedBasicValve(new
LoginConfig(authMethod, realmName, null, null)));
+ standardContext.addValve(new LimitedBasicValve());
}
}
- final List<String> addresses = new ArrayList<String>();
+ final List<String> addresses = new ArrayList<>();
for (final Connector connector : connectors) {
for (final String mapping : wrapper.findMappings()) {
final URI address = new URI(connector.getScheme(), null,
host.getName(), connector.getPort(), contextRoot + mapping, null, null);
@@ -203,14 +203,19 @@ public class TomcatHessianRegistry imple
}
//Set the proper authenticator
- if ("BASIC".equals(authMethod)) {
- context.addValve(new BasicAuthenticator());
- } else if ("DIGEST".equals(authMethod)) {
- context.addValve(new DigestAuthenticator());
- } else if ("CLIENT-CERT".equals(authMethod)) {
- context.addValve(new SSLAuthenticator());
- } else if ("NONE".equals(authMethod)) {
- context.addValve(new NonLoginAuthenticator());
+ switch (authMethod) {
+ case "BASIC":
+ context.addValve(new BasicAuthenticator());
+ break;
+ case "DIGEST":
+ context.addValve(new DigestAuthenticator());
+ break;
+ case "CLIENT-CERT":
+ context.addValve(new SSLAuthenticator());
+ break;
+ case "NONE":
+ context.addValve(new NonLoginAuthenticator());
+ break;
}
context.getPipeline().addValve(new OpenEJBValve());
@@ -238,7 +243,7 @@ public class TomcatHessianRegistry imple
if (host == null) {
host = engine.findChild(engine.getDefaultHost());
if (host == null) {
- throw new IllegalArgumentException("Invalid virtual host '" +
host + "'. Do you have a matchiing Host entry in the server.xml?");
+ throw new IllegalArgumentException("Invalid virtual host '" +
engine.getDefaultHost() + "'. Do you have a matchiing Host entry in the
server.xml?");
}
}
@@ -255,17 +260,11 @@ public class TomcatHessianRegistry imple
}
protected static class LimitedBasicValve extends BasicAuthenticator {
- private final LoginConfig fakeLoginConfig;
-
- protected LimitedBasicValve(final LoginConfig fakeLoginConfig) {
- this.fakeLoginConfig = fakeLoginConfig;
- }
-
@Override
public void invoke(final Request request, final Response response)
throws IOException, ServletException {
final String requestURI = request.getDecodedRequestURI();
if (requestURI.startsWith(HESSIAN)) {
- if (!authenticate(request, response, fakeLoginConfig)) {
+ if (!authenticate(request, response)) {
return;
}
}
