Author: rmannibucau
Date: Mon Oct 15 14:21:46 2012
New Revision: 1398301
URL: http://svn.apache.org/viewvc?rev=1398301&view=rev
Log:
TOMEE-467 arquillian doesn't support uppercase properties
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.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=1398301&r1=1398300&r2=1398301&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 Oct 15 14:21:46 2012
@@ -44,7 +44,6 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -309,9 +308,13 @@ public class Setup {
final File confSrc = new File(src);
if (confSrc.exists()) {
final File conf = new File(openejbHome, dir);
- final Collection<File> files =
org.apache.openejb.loader.Files.collect(confSrc, TrueFileFilter.instance());
+ final Collection<File> files =
org.apache.openejb.loader.Files.collect(confSrc,
DirectFileOnlyFilter.instance());
files.remove(confSrc);
for (File f : files) {
+ if (f.isHidden()) {
+ continue;
+ }
+
if (f.isDirectory()) {
LOGGER.log(Level.WARNING, "skipping " +
f.getAbsolutePath() + " since folders are currently not supported");
continue;
@@ -361,4 +364,20 @@ public class Setup {
return true;
}
}
+
+ private static class DirectFileOnlyFilter implements FileFilter {
+ private static DirectFileOnlyFilter INSTANCE = null;
+
+ public static DirectFileOnlyFilter instance() {
+ if (INSTANCE == null) {
+ INSTANCE = new DirectFileOnlyFilter();
+ }
+ return INSTANCE;
+ }
+
+ @Override
+ public boolean accept(final File pathname) {
+ return !pathname.isDirectory();
+ }
+ }
}
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java?rev=1398301&r1=1398300&r2=1398301&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
Mon Oct 15 14:21:46 2012
@@ -41,7 +41,7 @@ public class RemoteTomEEConfiguration ex
private boolean cleanOnStartUp;
private boolean debug;
private int debugPort = 5005;
- private String CATALINA_OPTS = null; // using this format to match the
script one
+ private String catalina_opts = null; // using this format to match the
script one
public String getGroupId() {
return groupId;
@@ -170,12 +170,12 @@ public class RemoteTomEEConfiguration ex
this.debugPort = debugPort;
}
- public String getCATALINA_OPTS() {
- return CATALINA_OPTS;
+ public String getCatalina_opts() {
+ return catalina_opts;
}
- public void setCATALINA_OPTS(final String opts) {
- this.CATALINA_OPTS = opts;
+ public void setCatalina_opts(final String opts) {
+ this.catalina_opts = opts;
}
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1398301&r1=1398300&r2=1398301&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
Mon Oct 15 14:21:46 2012
@@ -92,7 +92,7 @@ public class RemoteTomEEContainer extend
}
private List<String> args() {
- String opts = configuration.getCATALINA_OPTS();
+ String opts = configuration.getCatalina_opts();
if (opts == null || (opts = opts.trim()).isEmpty()) {
return Collections.emptyList();
}
@@ -155,7 +155,7 @@ public class RemoteTomEEContainer extend
Setup.synchronizeFolder(openejbHome, configuration.getBin(), "bin");
Setup.synchronizeFolder(openejbHome, configuration.getLib(), "lib");
- final String opts = configuration.getCATALINA_OPTS();
+ final String opts = configuration.getCatalina_opts();
Setup.exportProperties(openejbHome, configuration, opts == null ||
(!opts.contains("-Xm") && !opts.matches(".*-XX:[^=]*Size=.*")));
Setup.installArquillianBeanDiscoverer(openejbHome);
