Author: dblevins
Date: Sat Mar 16 23:05:42 2013
New Revision: 1457332
URL: http://svn.apache.org/r1457332
Log:
revert 1457331 -- was not a clean commit
Removed:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/test/
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/resources/default.arquillian-tomee-remote.properties
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/resources/default.arquillian-tomee-webapp.properties
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/JavaMailTest.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessEjbCdiBeanInterceptorsTest.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/foo.xml
tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/taglib.xml
tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/Test.java
Modified:
tomee/tomee/trunk/ (props changed)
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
(props changed)
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/ThisInConstructorTest.java
(props changed)
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/TldTaglibXml.java
tomee/tomee/trunk/container/openejb-jee/pom.xml
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
tomee/tomee/trunk/container/openejb-jee/src/test/resources/jsf/ (props
changed)
tomee/tomee/trunk/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
(props changed)
tomee/tomee/trunk/examples/application-composer/ (props changed)
tomee/tomee/trunk/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java
tomee/tomee/trunk/src/ (props changed)
Propchange: tomee/tomee/trunk/
------------------------------------------------------------------------------
Merged /tomee/tomee/branches/tomee-1.5.x:r1457329
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Sat Mar 16 23:05:42 2013
@@ -80,13 +80,41 @@ public abstract class TomEEContainer<Con
if (prefixes == null) return;
- ConfigurationOverrides.apply(configuration, System.getProperties(),
prefixes.value());
+ //
+ // Override the config with system properties
+ //
+ final ObjectMap map = new ObjectMap(configuration);
+ for (String key : map.keySet()) {
+ for (String prefix : prefixes.value()) {
+ final String property = prefix + "." + key;
+ final String value = System.getProperty(property);
+
+ if (value == null) {
+ LOGGER.log(Level.FINE, String.format("Unset '%s'",
property));
+ continue;
+ }
+
+ try {
+ LOGGER.log(Level.INFO, String.format("Applying override
'%s=%s'", property, value));
+ map.put(key, value);
+ } catch (Exception e) {
+ try {
+ map.put(key, Integer.parseInt(value)); // we manage
String and int and boolean so let's try an int
+ } catch (Exception ignored) {
+ try {
+ map.put(key, Boolean.parseBoolean(value)); // idem
let's try a boolean
+ } catch (Exception ignored2) {
+ LOGGER.log(Level.WARNING, String.format("Override
failed '%s=%s'", property, value), e);
+ }
+ }
+ }
+ }
+ }
setPorts();
// with multiple containers we don't want it so let the user eb able
to skip it
if (configuration.getExportConfAsSystemProperty()) {
- final ObjectMap map = new ObjectMap(configuration);
//
// Export the config back out to properties
//
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-remote/pom.xml Sat Mar 16
23:05:42 2013
@@ -140,12 +140,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
Sat Mar 16 23:05:42 2013
@@ -28,11 +28,11 @@ import java.util.List;
@Prefixes({"tomee", "tomee.remote"})
public class RemoteTomEEConfiguration extends TomEEConfiguration {
- private String groupId;
- private String artifactId;
- private String version;
- private String classifier;
- private String type;
+ private String groupId = "org.apache.openejb";
+ private String artifactId = "apache-tomee";
+ private String version = "LATEST";
+ private String classifier = "webprofile";
+ private String type = "zip";
private boolean removeUnusedWebapps = true;
private int ajpPort = 8009;
private String conf;
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml
Sat Mar 16 23:05:42 2013
@@ -25,6 +25,7 @@
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
<property name="ajpPort">-1</property>
+ <property name="version">${tomee.version}</property>
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
<property name="properties">
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
(original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Sat Mar
16 23:05:42 2013
@@ -277,12 +277,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
Sat Mar 16 23:05:42 2013
@@ -30,6 +30,7 @@
<property name="stopPort">-1</property>
<property name="tomcatVersion">${tomcat.version}</property>
<property name="useInstallerServlet">true</property>
+ <property name="version">${tomee.version}</property>
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
<property name="properties">
Propchange:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
Merged
/tomee/tomee/branches/tomee-1.5.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:r1457329
Propchange:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/ThisInConstructorTest.java
------------------------------------------------------------------------------
Merged
/tomee/tomee/branches/tomee-1.5.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/ThisInConstructorTest.java:r1457329
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/TldTaglibXml.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/TldTaglibXml.java?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/TldTaglibXml.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/TldTaglibXml.java
Sat Mar 16 23:05:42 2013
@@ -42,8 +42,6 @@ public class TldTaglibXml {
try {
final XMLStreamReader filter = new
TaglibNamespaceFilter(Sxc.prepareReader(inputStream));
return Sxc.unmarhsal(new TldTaglib$JAXB(), new
XoXMLStreamReaderImpl(filter));
- } catch (Exception e) {
- return new TldTaglib();
} finally {
IO.close(inputStream);
}
Modified: tomee/tomee/trunk/container/openejb-jee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/pom.xml?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-jee/pom.xml Sat Mar 16 23:05:42 2013
@@ -30,11 +30,12 @@
<packaging>jar</packaging>
<name>OpenEJB :: Container :: Java EE</name>
- <properties>
- <openejb.osgi.import.pkg>
- org.apache.geronimo.specs.jpa;resolution:=optional,
- org.apache.geronimo.specs.activation;resolution:=optional,
- *
+
+ <properties>
+ <openejb.osgi.import.pkg>
+ org.apache.geronimo.specs.jpa;resolution:=optional,
+ org.apache.geronimo.specs.activation;resolution:=optional,
+ *
</openejb.osgi.import.pkg>
</properties>
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
Sat Mar 16 23:05:42 2013
@@ -248,10 +248,10 @@ public class JaxbJavaee {
});
JaxbJavaee.HandlerChainsNamespaceFilter xmlFilter = new
JaxbJavaee.HandlerChainsNamespaceFilter(parser.getXMLReader());
-// xmlFilter.setContentHandler(unmarshaller.getUnmarshallerHandler());
-// HandlerChainsStringQNameAdapter adapter = new
HandlerChainsStringQNameAdapter();
-// adapter.setHandlerChainsNamespaceFilter(xmlFilter);
-// unmarshaller.setAdapter(HandlerChainsStringQNameAdapter.class,
adapter);
+ xmlFilter.setContentHandler(unmarshaller.getUnmarshallerHandler());
+ HandlerChainsStringQNameAdapter adapter = new
HandlerChainsStringQNameAdapter();
+ adapter.setHandlerChainsNamespaceFilter(xmlFilter);
+ unmarshaller.setAdapter(HandlerChainsStringQNameAdapter.class,
adapter);
SAXSource source = new SAXSource(xmlFilter, inputSource);
Propchange: tomee/tomee/trunk/container/openejb-jee/src/test/resources/jsf/
------------------------------------------------------------------------------
Merged
/tomee/tomee/branches/tomee-1.5.x/container/openejb-jee/src/test/resources/jsf:r1457329
Propchange:
tomee/tomee/trunk/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
Merged
/tomee/tomee/branches/tomee-1.5.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:r1457329
Propchange: tomee/tomee/trunk/examples/application-composer/
------------------------------------------------------------------------------
Merged
/tomee/tomee/branches/tomee-1.5.x/examples/application-composer:r1457329
Modified:
tomee/tomee/trunk/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java
(original)
+++
tomee/tomee/trunk/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java
Sat Mar 16 23:05:42 2013
@@ -32,8 +32,8 @@ public class TelephoneTest extends TestC
@Override
protected void setUp() throws Exception {
final Properties properties = new Properties();
-// properties.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.openejb.core.LocalInitialContextFactory");
-// properties.setProperty("openejb.embedded.remotable", "true");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.openejb.core.LocalInitialContextFactory");
+ properties.setProperty("openejb.embedded.remotable", "true");
// Uncomment these properties to change the defaults
//properties.setProperty("ejbd.port", "4202");
//properties.setProperty("ejbd.bind", "localhost");
@@ -83,7 +83,7 @@ public class TelephoneTest extends TestC
public void testTalkOverRemoteNetwork() throws Exception {
final Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.openejb.client.RemoteInitialContextFactory");
- properties.setProperty(Context.PROVIDER_URL,
"http://localhost:8080/tomee/ejb";);
+ properties.setProperty(Context.PROVIDER_URL, "ejbd://localhost:" +
Integer.parseInt(System.getProperty("ejbd.port", "4201")));
final InitialContext remoteContext = new InitialContext(properties);
final Telephone telephone = (Telephone)
remoteContext.lookup("TelephoneBeanRemote");
Modified:
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java?rev=1457332&r1=1457331&r2=1457332&view=diff
==============================================================================
---
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java
(original)
+++
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java
Sat Mar 16 23:05:42 2013
@@ -17,17 +17,16 @@
package org.apache.openejb.test.beans;
-public interface EmployeeHome extends javax.ejb.EJBHome {
-
+public interface EmployeeHome extends javax.ejb.EJBHome{
+
public Employee create(String lastname, String firstName)
- throws javax.ejb.CreateException, java.rmi.RemoteException;
-
- public int sum(int one, int two)
- throws java.rmi.RemoteException;
-
- public java.util.Collection findAll()
- throws javax.ejb.FinderException, java.rmi.RemoteException;
-
+ throws javax.ejb.CreateException, java.rmi.RemoteException;
+
+ public int sum(int one, int two) throws java.rmi.RemoteException;
+
+ public java.util.Collection findAll( )
+ throws javax.ejb.FinderException, java.rmi.RemoteException;
+
public Employee findByPrimaryKey(Integer primkey)
- throws javax.ejb.FinderException, java.rmi.RemoteException;
+ throws javax.ejb.FinderException, java.rmi.RemoteException;
}
\ No newline at end of file
Propchange: tomee/tomee/trunk/src/
------------------------------------------------------------------------------
Merged /tomee/tomee/branches/tomee-1.5.x/src:r1457329
