Author: dblevins
Date: Thu Sep 27 16:18:00 2012
New Revision: 1391077
URL: http://svn.apache.org/viewvc?rev=1391077&view=rev
Log:
merging 1390973 and 1390976 from trunk TOMEE-433 and TOMEE-432
Modified:
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
openejb/branches/openejb-4.5.0/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
Modified:
openejb/branches/openejb-4.5.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.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1391077&r1=1391076&r2=1391077&view=diff
==============================================================================
---
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
(original)
+++
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
Thu Sep 27 16:18:00 2012
@@ -31,6 +31,8 @@ public class TomEEConfiguration implemen
protected String dir = System.getProperty("java.io.tmpdir") +
"/arquillian-apache-tomee";
protected String appWorkingDir = System.getProperty("java.io.tmpdir");
protected String host = "localhost";
+ protected String stopHost = "localhost"; // generally localhost but host
(http) can be different
+ protected String stopCommand = "SHUTDOWN"; // default one - can be
overriden in server.xml
protected String serverXml = null;
protected String properties = "";
protected String portRange = ""; // only used if port < 0, empty means
whatever, can be "1024-65535"
@@ -141,4 +143,20 @@ public class TomEEConfiguration implemen
}
return array;
}
+
+ public String getStopHost() {
+ return stopHost;
+ }
+
+ public void setStopHost(String stopHost) {
+ this.stopHost = stopHost;
+ }
+
+ public String getStopCommand() {
+ return stopCommand + Character.toString((char) -1); // last char to
avoid warning/error log message
+ }
+
+ public void setStopCommand(String stopCommand) {
+ this.stopCommand = stopCommand;
+ }
}
Modified:
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1391077&r1=1391076&r2=1391077&view=diff
==============================================================================
---
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Thu Sep 27 16:18:00 2012
@@ -54,7 +54,6 @@ import java.util.logging.Logger;
public abstract class TomEEContainer<Configuration extends TomEEConfiguration>
implements DeployableContainer<Configuration> {
protected static final Logger LOGGER =
Logger.getLogger(TomEEContainer.class.getName());
- protected static final String SHUTDOWN_COMMAND = "SHUTDOWN" +
Character.toString((char) -1);
protected Configuration configuration;
protected Map<String, DeployedApp> moduleIds = new HashMap<String,
DeployedApp>();
private final Options options;
@@ -191,9 +190,9 @@ public abstract class TomEEContainer<Con
@Override
public void stop() throws LifecycleException {
try {
- Socket socket = new Socket(configuration.getHost(),
configuration.getStopPort());
+ Socket socket = new Socket(configuration.getStopHost(),
configuration.getStopPort());
OutputStream out = socket.getOutputStream();
- out.write(SHUTDOWN_COMMAND.getBytes());
+ out.write(configuration.getStopCommand().getBytes());
waitForShutdown(socket, 10);
} catch (Exception e) {
Modified:
openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1391077&r1=1391076&r2=1391077&view=diff
==============================================================================
---
openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
(original)
+++
openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Thu Sep 27 16:18:00 2012
@@ -1829,19 +1829,23 @@ public class AutoConfig implements Dynam
private String normalizeResourceId(String resourceId) {
if (resourceId == null) return null;
+ if (resourceId.startsWith("java:")) {
+ resourceId = resourceId.substring("java:".length());
+ }
+
// strip off "java:comp/env"
- if (resourceId.startsWith("java:comp/env/")) {
- resourceId = resourceId.substring("java:comp/env/".length());
+ if (resourceId.startsWith("comp/env/")) {
+ resourceId = resourceId.substring("comp/env/".length());
}
// strip off "java:openejb/Resource"
- if (resourceId.startsWith("java:openejb/Resource/")) {
- resourceId =
resourceId.substring("java:openejb/Resource/".length());
+ if (resourceId.startsWith("openejb/Resource/")) {
+ resourceId = resourceId.substring("openejb/Resource/".length());
}
// strip off "java:openejb/Connector"
- if (resourceId.startsWith("java:openejb/Connector/")) {
- resourceId =
resourceId.substring("java:openejb/Connector/".length());
+ if (resourceId.startsWith("openejb/Connector/")) {
+ resourceId = resourceId.substring("openejb/Connector/".length());
}
return resourceId;
Modified:
openejb/branches/openejb-4.5.0/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml?rev=1391077&r1=1391076&r2=1391077&view=diff
==============================================================================
---
openejb/branches/openejb-4.5.0/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
(original)
+++
openejb/branches/openejb-4.5.0/examples/multiple-tomee-arquillian/src/test/resources/arquillian.xml
Thu Sep 27 16:18:00 2012
@@ -39,4 +39,4 @@
</configuration>
</container>
</group>
-</arquillian>
\ No newline at end of file
+</arquillian>
