Author: rmannibucau
Date: Mon Sep 17 07:44:28 2012
New Revision: 1386494
URL: http://svn.apache.org/viewvc?rev=1386494&view=rev
Log:
TOMEE-418 quick session generation for branch
Modified:
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
openejb/branches/openejb-4.1.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Modified:
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1386494&r1=1386493&r2=1386494&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
(original)
+++
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
Mon Sep 17 07:44:28 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/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1386494&r1=1386493&r2=1386494&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
(original)
+++
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
Mon Sep 17 07:44:28 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/branches/openejb-4.1.0/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1386494&r1=1386493&r2=1386494&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
(original)
+++
openejb/branches/openejb-4.1.0/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
Mon Sep 17 07:44:28 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/branches/openejb-4.1.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1386494&r1=1386493&r2=1386494&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
(original)
+++
openejb/branches/openejb-4.1.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Mon Sep 17 07:44:28 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);
Modified:
openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java?rev=1386494&r1=1386493&r2=1386494&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
(original)
+++
openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
Mon Sep 17 07:44:28 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/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1386494&r1=1386493&r2=1386494&view=diff
==============================================================================
---
openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
(original)
+++
openejb/branches/openejb-4.1.0/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Mon Sep 17 07:44:28 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 {
