Author: andygumbrecht
Date: Fri Jul 18 09:19:13 2014
New Revision: 1611570
URL: http://svn.apache.org/r1611570
Log:
Not for 1.7.x
Modified:
tomee/tomee/branches/tomee-1.7.x/examples/multiple-arquillian-adapters/
(props changed)
tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/ (props changed)
tomee/tomee/branches/tomee-1.7.x/server/openejb-http/ (props changed)
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
Propchange:
tomee/tomee/branches/tomee-1.7.x/examples/multiple-arquillian-adapters/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 18 09:19:13 2014
@@ -1,2 +1,3 @@
target
*.iml
+.idea
Propchange: tomee/tomee/branches/tomee-1.7.x/server/openejb-ejbd/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 18 09:19:13 2014
@@ -9,3 +9,4 @@
target
*.bat
tmp
+activemq-data
Propchange: tomee/tomee/branches/tomee-1.7.x/server/openejb-http/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 18 09:19:13 2014
@@ -6,3 +6,4 @@
.project
.settings
target
+activemq-data
Modified:
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy?rev=1611570&r1=1611569&r2=1611570&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
(original)
+++
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/LogTest.groovy
Fri Jul 18 09:19:13 2014
@@ -59,7 +59,7 @@ class LogTest {
@Test
void test() throws Exception {
Utilities.withClient(deploymentURL, { CloseableHttpClient client ->
-
Assert.assertEquals('{"files":["catalina.2014-02-07.log","localhost_access_log.2014-02-07.txt"]}',
+
Assert.assertEquals('{"listFilesResultDto":{"files":["catalina.2014-02-07.log","localhost_access_log.2014-02-07.txt"]}}',
Utilities.getBody(client.execute(new
HttpGet("${deploymentURL.toURI()}rest/log/list-files")))
)
Utilities.getBody(client.execute(new
HttpGet("${deploymentURL.toURI()}rest/keep-alive")))
Modified:
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy?rev=1611570&r1=1611569&r2=1611570&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
(original)
+++
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webaccess/src/test/groovy/org/apache/tomee/webaccess/test/units/ScriptingTest.groovy
Fri Jul 18 09:19:13 2014
@@ -57,7 +57,7 @@ class ScriptingTest {
void test() throws Exception {
Utilities.withClient(deploymentURL, { CloseableHttpClient client ->
Assert.assertEquals(
- '{"output":"Hi there!"}',
+ '{"scriptingResultDto":{"output":"Hi there!"}}',
Utilities.post(deploymentURL, client, 'rest/scripting',
new BasicNameValuePair('engine', 'js'),
new BasicNameValuePair('script', 'print("Hi
there!");')
