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/26 12:07:02 UTC
svn commit: r1390366 - in /openejb/trunk/openejb/arquillian:
arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/
Author: rmannibucau
Date: Wed Sep 26 10:07:01 2012
New Revision: 1390366
URL: http://svn.apache.org/viewvc?rev=1390366&view=rev
Log:
TOMEE-429 bin and lib flder for arquillian-tomee-remote
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=1390366&r1=1390365&r2=1390366&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 Wed Sep 26 10:07:01 2012
@@ -290,15 +290,27 @@ public class Setup {
}
}
- public static void synchronizeConf(final File openejbHome, final File confSrc) {
- final File conf = new File(openejbHome, "conf");
- final Collection<File> files = org.apache.openejb.loader.Files.collect(confSrc, TrueFileFilter.instance());
- files.remove(confSrc);
- for (File f : files) {
- try {
- org.apache.openejb.loader.IO.copy(f, new File(conf, relativize(f, confSrc)));
- } catch (Exception e) {
- LOGGER.log(Level.WARNING, "ignoring copy of " + f.getAbsolutePath(), e);
+ public static void synchronizeFolder(final File openejbHome, final String src, final String dir) {
+ if (src != null && !src.isEmpty()) {
+ 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());
+ files.remove(confSrc);
+ for (File f : files) {
+ if (f.isDirectory()) {
+ LOGGER.log(Level.WARNING, "skipping " + f.getAbsolutePath() + " since folders are currently not supported");
+ continue;
+ }
+
+ try {
+ org.apache.openejb.loader.IO.copy(f, new File(conf, relativize(f, confSrc)));
+ } catch (Exception e) {
+ LOGGER.log(Level.WARNING, "ignoring copy of " + f.getAbsolutePath(), e);
+ }
+ }
+ } else {
+ LOGGER.warning("can't find " + confSrc.getAbsolutePath());
}
}
}
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=1390366&r1=1390365&r2=1390366&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 Wed Sep 26 10:07:01 2012
@@ -36,6 +36,8 @@ public class RemoteTomEEConfiguration ex
private boolean removeUnusedWebapps = true;
private int ajpPort = 8009;
private String conf;
+ private String bin;
+ private String lib;
private boolean cleanOnStartUp;
private boolean debug;
private int debugPort = 5005;
@@ -112,6 +114,22 @@ public class RemoteTomEEConfiguration ex
this.conf = conf;
}
+ public String getBin() {
+ return bin;
+ }
+
+ public void setBin(String bin) {
+ this.bin = bin;
+ }
+
+ public String getLib() {
+ return lib;
+ }
+
+ public void setLib(String lib) {
+ this.lib = lib;
+ }
+
@Override
public int[] portsAlreadySet() {
final List<Integer> value = new ArrayList<Integer>();
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=1390366&r1=1390365&r2=1390366&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 Wed Sep 26 10:07:01 2012
@@ -126,14 +126,9 @@ public class RemoteTomEEContainer extend
Setup.configureServerXml(openejbHome, configuration);
Setup.configureSystemProperties(openejbHome, configuration);
- if (configuration.getConf() != null && !configuration.getConf().isEmpty()) {
- final File confSrc = new File(configuration.getConf());
- if (confSrc.exists()) {
- Setup.synchronizeConf(openejbHome, confSrc);
- } else {
- LOGGER.warning("can't find " + confSrc.getAbsolutePath());
- }
- }
+ Setup.synchronizeFolder(openejbHome, configuration.getConf(), "conf");
+ Setup.synchronizeFolder(openejbHome, configuration.getBin(), "bin");
+ Setup.synchronizeFolder(openejbHome, configuration.getLib(), "lib");
Setup.exportProperties(openejbHome, configuration);