Author: rmannibucau
Date: Tue Aug 21 10:13:05 2012
New Revision: 1375457
URL: http://svn.apache.org/viewvc?rev=1375457&view=rev
Log:
small cleanup in arquillian tomee remote pom + fixing key used to retrieve
ports (bad copy/paste :s)
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/QuickServerXmlParser.java
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationCustomProviderTest.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/QuickServerXmlParser.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/QuickServerXmlParser.java?rev=1375457&r1=1375456&r2=1375457&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/QuickServerXmlParser.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/QuickServerXmlParser.java
Tue Aug 21 10:13:05 2012
@@ -18,9 +18,9 @@ public class QuickServerXmlParser extend
}
private static final String STOP_KEY = "STOP";
- private static final String HTTP_KEY = "STOP";
- private static final String AJP_KEY = "STOP";
- private static final String DEFAULT_CONNECTOR_KEY = "HTTP";
+ private static final String HTTP_KEY = "HTTP";
+ private static final String AJP_KEY = "AJP";
+ private static final String DEFAULT_CONNECTOR_KEY = HTTP_KEY;
public static final String DEFAULT_HTTP_PORT = "8080";
public static final String DEFAULT_STOP_PORT = "8005";
@@ -28,16 +28,12 @@ public class QuickServerXmlParser extend
private final Map<String, String> ports = new TreeMap<String,
String>(String.CASE_INSENSITIVE_ORDER);
- public QuickServerXmlParser() {
+ public QuickServerXmlParser() { // ensure defaults are present
ports.put(STOP_KEY, DEFAULT_STOP_PORT);
ports.put(HTTP_KEY, DEFAULT_HTTP_PORT);
ports.put(AJP_KEY, DEFAULT_AJP_PORT);
}
- public static void main(String[] args) throws Exception {
- System.out.println(parse(new File("/tmp/server.xml")));
- }
-
@Override
public void startElement(final String uri, final String localName,
final String qName, final Attributes attributes)
throws SAXException {
@@ -46,7 +42,7 @@ public class QuickServerXmlParser extend
if (port != null) {
ports.put(STOP_KEY, port);
} else {
- ports.put(STOP_KEY, port);
+ ports.put(STOP_KEY, DEFAULT_STOP_PORT);
}
} else if ("Connector".equalsIgnoreCase(localName)) {
String protocol = attributes.getValue("protocol");
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml?rev=1375457&r1=1375456&r2=1375457&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml Tue Aug 21
10:13:05 2012
@@ -159,26 +159,6 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <configuration>
- <portNames>
- <portName>tomee.http.port</portName>
- <portName>tomee.shutdown.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java?rev=1375457&r1=1375456&r2=1375457&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
Tue Aug 21 10:13:05 2012
@@ -32,6 +32,7 @@ import java.io.InputStream;
import java.net.URL;
import java.util.Map;
import java.util.TreeMap;
+import java.util.logging.Level;
import java.util.logging.Logger;
/*
@@ -115,7 +116,7 @@ public class TomEEWebappContainer extend
Setup.removeUselessWebapps(openejbHome);
}
- if (false) {
+ if (logger.isLoggable(Level.FINE)) {
Map<Object, Object> map = new TreeMap(System.getProperties());
for (Map.Entry<Object, Object> entry : map.entrySet()) {
System.out.printf("%s = %s\n", entry.getKey(),
entry.getValue());
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java?rev=1375457&r1=1375456&r2=1375457&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
Tue Aug 21 10:13:05 2012
@@ -243,8 +243,7 @@ public abstract class EjbObjectProxyHand
public Object call() throws Exception {
return synchronizedBusinessMethod(interfce, method, args);
}
- }, method.getReturnType() == Void.TYPE
- );
+ }, method.getReturnType() == Void.TYPE);
} else {
return synchronizedBusinessMethod(interfce, method, args);
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationCustomProviderTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationCustomProviderTest.java?rev=1375457&r1=1375456&r2=1375457&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationCustomProviderTest.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationCustomProviderTest.java
Tue Aug 21 10:13:05 2012
@@ -17,7 +17,6 @@
package org.apache.openejb.bval;
import org.apache.bval.jsr303.ApacheValidationProvider;
-import org.apache.openejb.Core;
import org.apache.openejb.assembler.classic.ValidatorBuilder;
import org.apache.openejb.bval.util.CustomValidatorProvider;
import org.apache.openejb.jee.Empty;
@@ -42,9 +41,6 @@ import static org.junit.Assert.assertTru
public class BeanValidationCustomProviderTest {
@EJB
private ABean bean;
- static {
- Core.warmup();
- }
@BeforeClass
public static void initProvider() {
