Author: rmannibucau
Date: Thu Sep 13 08:20:16 2012
New Revision: 1384227
URL: http://svn.apache.org/viewvc?rev=1384227&view=rev
Log:
removing ajp port from tomee embedded since we never added its support (and
that's not really useful since server.xml can be used)
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.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-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java?rev=1384227&r1=1384226&r2=1384227&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
Thu Sep 13 08:20:16 2012
@@ -27,17 +27,6 @@ import java.util.List;
*/
@Prefixes({"tomee", "tomee.embedded"})
public class EmbeddedTomEEConfiguration extends TomEEConfiguration {
-
- private int ajpPort = 8009;
-
- public int getAjpPort() {
- return ajpPort;
- }
-
- public void setAjpPort(int ajpPort) {
- this.ajpPort = ajpPort;
- }
-
@Override
public int[] portsAlreadySet() {
final List<Integer> value = new ArrayList<Integer>();
@@ -47,9 +36,6 @@ public class EmbeddedTomEEConfiguration
if (getHttpPort() > 0) {
value.add(getHttpPort());
}
- if (getAjpPort() > 0) {
- value.add(getAjpPort());
- }
return toInts(value);
}
}
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=1384227&r1=1384226&r2=1384227&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
Thu Sep 13 08:20:16 2012
@@ -25,7 +25,6 @@ import java.util.Properties;
public class Configuration {
private int httpPort = 8080;
- private int ajpPort = 8009;
private int stopPort = 8005;
private String host = "localhost";
protected String dir;
@@ -48,14 +47,6 @@ public class Configuration {
this.stopPort = stopPort;
}
- public int getAjpPort() {
- return ajpPort;
- }
-
- public void setAjpPort(int ajpPort) {
- this.ajpPort = ajpPort;
- }
-
public String getDir() {
return dir;
}
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=1384227&r1=1384226&r2=1384227&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
Thu Sep 13 08:20:16 2012
@@ -16,17 +16,6 @@
*/
package org.apache.tomee.embedded;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import javax.naming.Context;
-import javax.naming.NamingException;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Server;
import org.apache.catalina.Service;
@@ -60,6 +49,18 @@ import org.apache.velocity.app.Velocity;
import org.apache.velocity.runtime.log.NullLogChute;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
/**
* @version $Rev$ $Date$
*/
