Author: andygumbrecht
Date: Wed Sep 24 08:01:50 2014
New Revision: 1627248
URL: http://svn.apache.org/r1627248
Log:
Fix typos.
Define arquillian.xml
Un-ignore test - there seems to be a regression on at least
EmbeddedTomEEContainerTest and WsRsTest
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tck/src/test/resources/arquillian.xml
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webservices/ (props changed)
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-openejb-embedded-4/src/test/resources/arquillian.xml
Wed Sep 24 08:01:50 2014
@@ -16,9 +16,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<arquillian
+<arquillian xmlns="http://jboss.org/schema/arquillian";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
+
<container qualifier="openejb" default="true">
<configuration>
<property name="properties">
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tck/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tck/src/test/resources/arquillian.xml?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tck/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tck/src/test/resources/arquillian.xml
Wed Sep 24 08:01:50 2014
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<arquillian
+<arquillian xmlns="http://jboss.org/schema/arquillian";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
<container qualifier="tomee" default="true">
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
Wed Sep 24 08:01:50 2014
@@ -47,8 +47,7 @@ public class TomEEInjectionEnricher impl
private AppContext getAppContext(final Object instance) {
final String className = instance.getClass().getName();
- final ContainerSystem containerSystem =
-SystemInstance.get().getComponent(ContainerSystem.class);
+ final ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
final List<AppContext> appContexts = containerSystem.getAppContexts();
final ClassLoader loader = instance.getClass().getClassLoader();
@@ -61,16 +60,14 @@ SystemInstance.get().getComponent(Contai
}
}
-
Logger.getLogger(TomEEInjectionEnricher.class.getName()).log(Level.WARNING,
"Failed to find
-AppContext for: " + className);
+
Logger.getLogger(TomEEInjectionEnricher.class.getName()).log(Level.SEVERE,
"Failed to find AppContext for: " + className);
return null;
}
@Override
public Object[] resolve(final Method method) {
- return
OpenEJBEnricher.resolve(getAppContext(method.getDeclaringClass().getName()),
-testClass.get(), method);
+ return
OpenEJBEnricher.resolve(getAppContext(method.getDeclaringClass().getName()),
testClass.get(), method);
}
}
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
Wed Sep 24 08:01:50 2014
@@ -26,7 +26,6 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,7 +35,6 @@ import java.net.URL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-@Ignore
@RunWith(Arquillian.class)
// @RunAsClient
public class EmbeddedTomEEContainerTest {
@@ -44,8 +42,8 @@ public class EmbeddedTomEEContainerTest
@Deployment
public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class,
"EmbeddedTomEEContainerTest.war")
- .addClasses(AnEJB.class, AServlet.class, ARestService.class)
- .setWebXML(new
StringAsset(Descriptors.create(WebAppDescriptor.class).version("3.0").exportAsString()));
+ .addClasses(AnEJB.class, AServlet.class, ARestService.class)
+ .setWebXML(new
StringAsset(Descriptors.create(WebAppDescriptor.class).version("3.0").exportAsString()));
}
@EJB
@@ -63,7 +61,7 @@ public class EmbeddedTomEEContainerTest
public void servletIsDeployed() throws Exception {
final String url = this.url.toExternalForm() + "a-servlet";
final String read = IOUtils.toString(new URL(url).openStream());
- assertEquals("Failed to find: " + url,"ok=true", read);
+ assertEquals("Failed to find: " + url, "ok=true", read);
}
@Test
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/resources/arquillian.xml
Wed Sep 24 08:01:50 2014
@@ -16,9 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<arquillian
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
+<arquillian xmlns="http://jboss.org/schema/arquillian";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
<container qualifier="tomee" default="true">
<configuration>
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-moviefun-example/src/test/resources/arquillian.xml
Wed Sep 24 08:01:50 2014
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<arquillian
+<arquillian xmlns="http://jboss.org/schema/arquillian";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
Wed Sep 24 08:01:50 2014
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<arquillian
+<arquillian xmlns="http://jboss.org/schema/arquillian";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
Wed Sep 24 08:01:50 2014
@@ -93,7 +93,7 @@ public class WsRsTest {
Assert.assertEquals("hola", body);
}
- public static String asString(HttpResponse execute) throws IOException {
+ public static String asString(final HttpResponse execute) throws
IOException {
final InputStream in = execute.getEntity().getContent();
try {
return IO.slurp(in);
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1627248&r1=1627247&r2=1627248&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-webapp-remote/pom.xml
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-webapp-remote/pom.xml
Wed Sep 24 08:01:50 2014
@@ -237,10 +237,10 @@
<artifactId>openwebbeans-ee-common</artifactId>
<groupId>org.apache.openwebbeans</groupId>
</exclusion>
- <exclusion>
- <artifactId>openwebbeans-spi</artifactId>
- <groupId>org.apache.openwebbeans</groupId>
- </exclusion>
+ <!--<exclusion>-->
+ <!--<artifactId>openwebbeans-spi</artifactId>-->
+ <!--<groupId>org.apache.openwebbeans</groupId>-->
+ <!--</exclusion>-->
<exclusion>
<artifactId>openwebbeans-ejb</artifactId>
<groupId>org.apache.openwebbeans</groupId>
Propchange: tomee/tomee/branches/tomee-1.7.x/tomee/tomee-webservices/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 24 08:01:50 2014
@@ -7,3 +7,4 @@
.settings
out
target
+.idea
