You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/09/17 09:31:46 UTC
svn commit: r1386492 - in /openejb/trunk/openejb:
arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/
maven/tomee-maven-plugin...
Author: rmannibucau
Date: Mon Sep 17 07:31:45 2012
New Revision: 1386492
URL: http://svn.apache.org/viewvc?rev=1386492&view=rev
Log:
TOMEE-418 quick session for arquillian + tomee mvn plugin
Added:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/FastNonSecureRandom.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/QuickSessionManager.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1386492&r1=1386491&r2=1386492&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Mon Sep 17 07:31:45 2012
@@ -268,6 +268,11 @@ public class Setup {
}
builder.append("\n").append(configuration.systemProperties());
+ if (configuration.isQuickSession()) {
+ builder.append("\nopenejb.session.manager=org.apache.tomee.catalina.session.QuickSessionManager");
+ }
+ builder.append("\n");
+
FileWriter writer = null;
try {
writer = new FileWriter(systemProperties);
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1386492&r1=1386491&r2=1386492&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java Mon Sep 17 07:31:45 2012
@@ -34,6 +34,7 @@ public class TomEEConfiguration implemen
protected String serverXml = null;
protected String properties = "";
protected String portRange = ""; // only used if port < 0, empty means whatever, can be "1024-65535"
+ protected boolean quickSession = true;
public int getHttpPort() {
return httpPort;
@@ -114,6 +115,14 @@ public class TomEEConfiguration implemen
this.portRange = portRange;
}
+ public boolean isQuickSession() {
+ return quickSession;
+ }
+
+ public void setQuickSession(boolean quickSession) {
+ this.quickSession = quickSession;
+ }
+
public int[] portsAlreadySet() {
final List<Integer> value = new ArrayList<Integer>();
if (stopPort > 0) {
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1386492&r1=1386491&r2=1386492&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Mon Sep 17 07:31:45 2012
@@ -78,6 +78,7 @@ public class EmbeddedTomEEContainer exte
configuration.setHost(tomeeConfiguration.getHost());
configuration.setServerXml(tomeeConfiguration.getServerXml());
configuration.setProperties(tomeeConfiguration.systemPropertiesAsProperties());
+ configuration.setQuickSession(tomeeConfiguration.isQuickSession());
return configuration;
}
Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1386492&r1=1386491&r2=1386492&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Mon Sep 17 07:31:45 2012
@@ -207,6 +207,11 @@ public abstract class AbstractTomEEMojo
protected Map<String, String> systemVariables;
/**
+ * @parameter expression="${tomee-plugin.quick-session}" default-value="true"
+ */
+ private boolean quickSession;
+
+ /**
* supported formats:
* --> groupId:artifactId:version...
* --> unzip:groupId:artifactId:version...
@@ -548,6 +553,9 @@ public abstract class AbstractTomEEMojo
if (getNoShutdownHook()) {
strings.add("-Dtomee.noshutdownhook=true");
}
+ if (quickSession) {
+ strings.add("-Dopenejb.session.manager=org.apache.tomee.catalina.session.QuickSessionManager");
+ }
System.setProperty("server.shutdown.port", Integer.toString(tomeeShutdownPort));
final RemoteServer server = new RemoteServer(getConnectAttempts(), false);
Added: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/FastNonSecureRandom.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/FastNonSecureRandom.java?rev=1386492&view=auto
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/FastNonSecureRandom.java (added)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/FastNonSecureRandom.java Mon Sep 17 07:31:45 2012
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.catalina.session;
+
+import java.security.SecureRandom;
+import java.util.Random;
+
+public class FastNonSecureRandom extends SecureRandom {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Random random = new Random();
+
+ @Override
+ public String getAlgorithm() {
+ return "INSECURE";
+ }
+
+ @Override
+ public synchronized void setSeed(byte[] seed) {
+ // Not implemented
+ }
+
+ @Override
+ public synchronized void setSeed(long seed) {
+ // The super class constructor calls this method earlier than our
+ // fields are initialized. Ignore the call.
+ if (random == null) {
+ return;
+ }
+ random.setSeed(seed);
+ }
+
+ @Override
+ public synchronized void nextBytes(byte[] bytes) {
+ random.nextBytes(bytes);
+ }
+
+ @Override
+ public byte[] generateSeed(int numBytes) {
+ byte[] value = new byte[numBytes];
+ nextBytes(value);
+ return value;
+ }
+
+}
Added: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/QuickSessionManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/QuickSessionManager.java?rev=1386492&view=auto
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/QuickSessionManager.java (added)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/session/QuickSessionManager.java Mon Sep 17 07:31:45 2012
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.catalina.session;
+
+import org.apache.catalina.session.StandardManager;
+
+public class QuickSessionManager extends StandardManager {
+ public QuickSessionManager() {
+ setSecureRandomClass("org.apache.tomee.catalina.session.FastNonSecureRandom");
+ }
+}
Modified: openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java?rev=1386492&r1=1386491&r2=1386492&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java Mon Sep 17 07:31:45 2012
@@ -30,6 +30,7 @@ public class Configuration {
protected String dir;
private File serverXml = null;
private Properties properties;
+ private boolean quickSession = true;
public int getHttpPort() {
return httpPort;
@@ -89,4 +90,12 @@ public class Configuration {
public Properties getProperties() {
return properties;
}
+
+ public boolean isQuickSession() {
+ return quickSession;
+ }
+
+ public void setQuickSession(boolean quickSession) {
+ this.quickSession = quickSession;
+ }
}
Modified: openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1386492&r1=1386491&r2=1386492&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java Mon Sep 17 07:31:45 2012
@@ -85,11 +85,16 @@ public class Container {
configuration.setHttpPort(23880);
configuration.setStopPort(23881);
setup(configuration);
- tomcat = new TomcatWithFastSessionIDs();
}
public void setup(Configuration configuration) {
this.configuration = configuration;
+
+ if (configuration.isQuickSession()) {
+ tomcat = new TomcatWithFastSessionIDs();
+ } else {
+ tomcat = new Tomcat();
+ }
}
public void start() throws Exception {