Author: andygumbrecht
Date: Thu Sep 18 14:00:16 2014
New Revision: 1625982
URL: http://svn.apache.org/r1625982
Log:
URLs
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/moviefun.jsp
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/index.jsp
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
tomee/tomee/trunk/assembly/openejb-standalone/README.html
tomee/tomee/trunk/assembly/openejb-standalone/src/main/conf/README.txt
tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/README.txt
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClientInjections.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples
tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.help
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf
tomee/tomee/trunk/container/openejb-core/src/main/resources/openejb-version.properties
tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/cmd/Messages.properties
tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-openejb-jar.xml
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ActivationConfigType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AutoIncrementTableType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/CustomGeneratorType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DatabaseGeneratedType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EjbRelationType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/KeyGeneratorType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java
tomee/tomee/trunk/container/openejb-jee/src/test/resources/daytrader-corrected.xml
tomee/tomee/trunk/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
tomee/tomee/trunk/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
tomee/tomee/trunk/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
tomee/tomee/trunk/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
tomee/tomee/trunk/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
tomee/tomee/trunk/examples/access-timeout/README.md
tomee/tomee/trunk/examples/alternate-descriptors/README.md
tomee/tomee/trunk/examples/applet/pom.xml
tomee/tomee/trunk/examples/applicationexception/README.md
tomee/tomee/trunk/examples/async-methods/README.md
tomee/tomee/trunk/examples/bean-validation-design-by-contract/README.md
tomee/tomee/trunk/examples/cdi-alternative-and-stereotypes/README.md
tomee/tomee/trunk/examples/cdi-application-scope/README.md
tomee/tomee/trunk/examples/cdi-basic/README.md
tomee/tomee/trunk/examples/cdi-produces-disposes/README.md
tomee/tomee/trunk/examples/cdi-produces-field/README.md
tomee/tomee/trunk/examples/cdi-request-scope/README.md
tomee/tomee/trunk/examples/component-interfaces/README.md
tomee/tomee/trunk/examples/custom-injection/README.md
tomee/tomee/trunk/examples/datasource-ciphered-password/README.md
tomee/tomee/trunk/examples/datasource-versioning/README.md
tomee/tomee/trunk/examples/decorators/README.md
tomee/tomee/trunk/examples/dynamic-dao-implementation/README.md
tomee/tomee/trunk/examples/dynamic-datasource-routing/README.md
tomee/tomee/trunk/examples/dynamic-implementation/README.md
tomee/tomee/trunk/examples/ear-testing/README.md
tomee/tomee/trunk/examples/helloworld-weblogic/README.md
tomee/tomee/trunk/examples/index.md
tomee/tomee/trunk/examples/injection-of-connectionfactory/README.md
tomee/tomee/trunk/examples/injection-of-datasource/README.md
tomee/tomee/trunk/examples/injection-of-ejbs/README.md
tomee/tomee/trunk/examples/injection-of-entitymanager/README.md
tomee/tomee/trunk/examples/injection-of-env-entry/README.md
tomee/tomee/trunk/examples/interceptors/README.md
tomee/tomee/trunk/examples/jpa-eclipselink/README.md
tomee/tomee/trunk/examples/jpa-enumerated/README.md
tomee/tomee/trunk/examples/jpa-hibernate/README.md
tomee/tomee/trunk/examples/jsf-cdi-and-ejb/pom.xml
tomee/tomee/trunk/examples/jsf-managedBean-and-ejb/pom.xml
tomee/tomee/trunk/examples/lookup-of-ejbs-with-descriptor/README.md
tomee/tomee/trunk/examples/lookup-of-ejbs/README.md
tomee/tomee/trunk/examples/mbean-auto-registration/README.md
tomee/tomee/trunk/examples/moviefun/README.md
tomee/tomee/trunk/examples/movies-complete-meta/README.md
tomee/tomee/trunk/examples/movies-complete/README.md
tomee/tomee/trunk/examples/quartz-app/README.md
tomee/tomee/trunk/examples/rest-on-ejb/README.md
tomee/tomee/trunk/examples/schedule-expression/README.md
tomee/tomee/trunk/examples/schedule-methods-meta/README.md
tomee/tomee/trunk/examples/schedule-methods/README.md
tomee/tomee/trunk/examples/simple-cdi-interceptor/README.md
tomee/tomee/trunk/examples/simple-cmp2/README.md
tomee/tomee/trunk/examples/simple-mdb-with-descriptor/README.md
tomee/tomee/trunk/examples/simple-mdb/README.md
tomee/tomee/trunk/examples/simple-singleton/README.md
tomee/tomee/trunk/examples/simple-stateful-callbacks/README.md
tomee/tomee/trunk/examples/simple-stateful/README.md
tomee/tomee/trunk/examples/simple-stateless-callbacks/README.md
tomee/tomee/trunk/examples/simple-stateless-with-descriptor/README.md
tomee/tomee/trunk/examples/simple-stateless/README.md
tomee/tomee/trunk/examples/simple-webservice/README.md
tomee/tomee/trunk/examples/struts/pom.xml
tomee/tomee/trunk/examples/telephone-stateful/README.md
tomee/tomee/trunk/examples/testcase-injection/README.md
tomee/tomee/trunk/examples/testing-security-2/README.md
tomee/tomee/trunk/examples/testing-security-3/README.md
tomee/tomee/trunk/examples/testing-security-meta/README.md
tomee/tomee/trunk/examples/testing-security/README.md
tomee/tomee/trunk/examples/testing-transactions-bmt/README.md
tomee/tomee/trunk/examples/testing-transactions/README.md
tomee/tomee/trunk/examples/transaction-rollback/README.md
tomee/tomee/trunk/examples/troubleshooting/README.md
tomee/tomee/trunk/examples/webservice-attachments/README.md
tomee/tomee/trunk/examples/webservice-inheritance/README.md
tomee/tomee/trunk/examples/webservice-security/README.md
tomee/tomee/trunk/examples/webservice-security/src/main/resources/META-INF/openejb-jar.xml
tomee/tomee/trunk/examples/webservice-ws-security/README.md
tomee/tomee/trunk/itests/openejb-itests-client/src/main/resources/META-INF/openejb-version.properties
tomee/tomee/trunk/itests/openejb-itests-client/src/main/resources/META-INF/org.apache.openejb.cli/test.help
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/server/openejb-client/src/main/resources/openejb-client-version.properties
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
tomee/tomee/trunk/server/openejb-server/src/main/resources/META-INF/openejb-server.xml
tomee/tomee/trunk/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/start.examples
tomee/tomee/trunk/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/start.help
tomee/tomee/trunk/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/stop.examples
tomee/tomee/trunk/server/openejb-server/src/main/resources/META-INF/org.apache.openejb.cli/stop.help
tomee/tomee/trunk/server/openejb-ssh/README.md
tomee/tomee/trunk/tomee/apache-tomee/src/main/resources/service.bat
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
tomee/tomee/trunk/tomee/tomee-webaccess/src/test/resources/test/log/catalina.2014-02-07.log
tomee/tomee/trunk/tomee/tomee-webapp/src/main/webapp/README.txt
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/moviefun.jsp
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/moviefun.jsp?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/moviefun.jsp
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/moviefun.jsp
Thu Sep 18 14:00:16 2014
@@ -124,7 +124,7 @@
<div id="poweredby" class="smalltext">
Powered by
<a href="http://tomcat.apache.org"; class="smalltext">Apache Tomcat</a>
and
- <a href="http://openejb.apache.org"; class="smalltext">Apache
OpenEJB</a>.
+ <a href="http://tomee.apache.org"; class="smalltext">Apache TomEE</a>.
<br/>
</div>
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/index.jsp?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/index.jsp
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/webapp/index.jsp
Thu Sep 18 14:00:16 2014
@@ -33,7 +33,7 @@
<div id="poweredby" class="smalltext">
Powered by
<a href="http://tomcat.apache.org"; class="smalltext">Apache Tomcat</a>
and
- <a href="http://openejb.apache.org"; class="smalltext">Apache
OpenEJB</a>.
+ <a href="http://tomee.apache.org"; class="smalltext">Apache TomEE</a>.
<br/>
</div>
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/JAXWSTest.java
Thu Sep 18 14:00:16 2014
@@ -45,7 +45,7 @@ public class JAXWSTest {
@Test
public void invoke() throws Exception {
- final Service service = Service.create(new URL(url.toExternalForm() +
"webservices/HelloWS?wsdl"), new
QName("http://jaxws.tests.arquillian.openejb.apache.org/";, "HelloWSService"));
+ final Service service = Service.create(new URL(url.toExternalForm() +
"webservices/HelloWS?wsdl"), new
QName("http://jaxws.tests.arquillian.tomee.apache.org/";, "HelloWSService"));
final Hello hello = service.getPort(Hello.class);
assertEquals("hi foo!", hello.hi("foo"));
}
Modified:
tomee/tomee/trunk/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/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
Thu Sep 18 14:00:16 2014
@@ -63,7 +63,7 @@ public class WsRsTest {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<soap:Envelope
xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>\n" +
" <soap:Body>\n" +
- " <ns1:hello
xmlns:ns1=\"http://wsrs.jaxws.tests.arquillian.openejb.apache.org/\"/>\n" +
+ " <ns1:hello
xmlns:ns1=\"http://wsrs.jaxws.tests.arquillian.tomee.apache.org/\"/>\n" +
" </soap:Body>\n" +
"</soap:Envelope>"));
@@ -73,7 +73,7 @@ public class WsRsTest {
final String expected = "" +
"<soap:Envelope
xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>" +
"<soap:Body>" +
- "<ns:helloResponse
xmlns:ns=\"http://wsrs.jaxws.tests.arquillian.openejb.apache.org/\";>" +
+ "<ns:helloResponse
xmlns:ns=\"http://wsrs.jaxws.tests.arquillian.tomee.apache.org/\";>" +
"<return>hola</return>" +
"</ns:helloResponse>" +
"</soap:Body>" +
Modified: tomee/tomee/trunk/assembly/openejb-standalone/README.html
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-standalone/README.html?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-standalone/README.html (original)
+++ tomee/tomee/trunk/assembly/openejb-standalone/README.html Thu Sep 18
14:00:16 2014
@@ -61,9 +61,9 @@
</ul>
</p>
-<P>Thank you for using <A href="http://openejb.apache.org/";>OpenEJB</A>!.
+<P>Thank you for using <A href="http://tomee.apache.org/";>OpenEJB</A>!.
</P>
<P><B>The Apache OpenEJB Project</B> <BR><A
-href="http://openejb.apache.org/";>http://openejb.apache.org/</A> </P>
+href="http://tomee.apache.org/";>http://tomee.apache.org/</A> </P>
<P>
<P></P></BODY></HTML>
Modified: tomee/tomee/trunk/assembly/openejb-standalone/src/main/conf/README.txt
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-standalone/src/main/conf/README.txt?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-standalone/src/main/conf/README.txt
(original)
+++ tomee/tomee/trunk/assembly/openejb-standalone/src/main/conf/README.txt Thu
Sep 18 14:00:16 2014
@@ -124,7 +124,7 @@ DETAILS ABOUT EACH FILE
To know what properties can be overriden the './bin/openejb
properties' command is very useful: see
- http://openejb.apache.org/3.0/properties-tool.html
+ http://tomee.apache.org/3.0/properties-tool.html
It's function is to connect to a running server and print a canonical
list of all properties OpenEJB can see via the various means of
@@ -142,7 +142,7 @@ DETAILS ABOUT EACH FILE
The -D properties can actually go before or after the command
- See http://openejb.apache.org/3.0/system-properties.html
+ See http://tomee.apache.org/3.0/system-properties.html
NOT CONFIGURABLE VIA THIS FILE
Modified:
tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/README.txt
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/README.txt?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/README.txt
(original)
+++ tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/README.txt
Thu Sep 18 14:00:16 2014
@@ -1,7 +1,7 @@
======================================================
Apache OpenEJB -- EJB Container System and EJB Server
-Apache OpenEJB ${pom.version} http://openejb.apache.org/
+Apache OpenEJB ${pom.version} http://tomee.apache.org/
------------------------------------------------------
___________________
Installation
@@ -55,9 +55,9 @@ Support
===================
Any problems with this release can be reported to our user
- mailing list at us...@openejb.apache.org
+ mailing list at us...@tomee.apache.org
Follow this link for other subscription and list information:
- http://openejb.apache.org/mailing-lists.html
+ http://tomee.apache.org/mailing-lists.html
=========================================================================
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClientInjections.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClientInjections.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClientInjections.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClientInjections.java
Thu Sep 18 14:00:16 2014
@@ -65,7 +65,7 @@ public final class ClientInjections {
+ object.getClass().getName()
+ ". Ensure that class was annotated with @"
+ LocalClient.class.getName() + " and was successfully
discovered and deployed. "
- + " See
http://openejb.apache.org/3.0/local-client-injection.html";);
+ + " See
http://tomee.apache.org/3.0/local-client-injection.html";);
}
return new InjectionProcessor(object, injections, ctx);
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
Thu Sep 18 14:00:16 2014
@@ -243,8 +243,8 @@ public class MainImpl implements Main {
"For example 'openejb deploy --help'.\n" +
"\n" +
"Apache OpenEJB -- EJB Container System and Server.\n" +
- "For additional information, see http://openejb.apache.org\n"; +
- "Bug Reports to <us...@openejb.apache.org>";
+ "For additional information, see http://tomee.apache.org\n"; +
+ "Bug Reports to <us...@tomee.apache.org>";
if (!printHeader) {
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
Thu Sep 18 14:00:16 2014
@@ -29,7 +29,7 @@ import java.util.Properties;
public final class OpenEjbVersion {
private final String copyright;//Copyright 1999-X (C) Apache OpenEJB
Project, All Rights Reserved.
- private final String url; //http://openejb.apache.org
+ private final String url; //http://tomee.apache.org
private final String version;//${pom.version}
private final String date;//@DATE-REPLACED-BY-MAVEN@
private final String time;//@TIME-REPLACED-BY-MAVEN@
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.examples
Thu Sep 18 14:00:16 2014
@@ -48,4 +48,4 @@ Example: Combinations of options
openejb validate -vvv /foo/bar.jar
openejb validate -xml /home/dblevins/mybeans/*.jar
-Bug Reports to <u...@openejb.apache.org>
+Bug Reports to <u...@tomee.apache.org>
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.help
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.help?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.help
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/validate.help
Thu Sep 18 14:00:16 2014
@@ -25,6 +25,6 @@ OPTIONS
Apache OpenEJB -- EJB Container System and EJB Server.
For updates and additional information, visit
-http://openejb.apache.org
+http://tomee.apache.org
-Bug Reports to <u...@openejb.apache.org>
+Bug Reports to <u...@tomee.apache.org>
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.openejb.conf
Thu Sep 18 14:00:16 2014
@@ -159,7 +159,7 @@
<!--
# For more examples of database configuration see:
-# http://openejb.apache.org/containers-and-resources.html
+# http://tomee.apache.org/containers-and-resources.html
-->
<Resource id="My DataSource" type="DataSource">
@@ -185,7 +185,7 @@
# The <Deployments> element can be used to configure file
# paths where OpenEJB should look for ejb jars or ear files.
#
-# See http://openejb.apache.org/3.0/deployments.html
+# See http://tomee.apache.org/3.0/deployments.html
#
# The below entry is simply a default and can be changed or deleted
-->
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/resources/openejb-version.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/openejb-version.properties?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/resources/openejb-version.properties
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/resources/openejb-version.properties
Thu Sep 18 14:00:16 2014
@@ -15,7 +15,7 @@
# limitations under the License.
#
copyright=Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
-url=http://openejb.apache.org/
+url=http://tomee.apache.org/
version=${pom.version}
date=@DATE-REPLACED-BY-MAVEN@
time=@TIME-REPLACED-BY-MAVEN@
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/cmd/Messages.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/cmd/Messages.properties?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/cmd/Messages.properties
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/cmd/Messages.properties
Thu Sep 18 14:00:16 2014
@@ -25,4 +25,4 @@ cmd.properties.opt.help = Lists these op
# options.addOption(option("s", "server-url", "url",
"cmd.properties.opt.server"));
cmd.properties.opt.server = Sets the url of the OpenEJB server to contact.
The value should be the same as the JNDI Provider URL used to lookup EJBs. The
default is 'ejbd://localhost:4201'.
-cmd.properties.header = OpenEJB Configuration Properties\n\nThe output of this
tool takes all overrideable components OpenEJB sees\nand outputs their
properties along with the current value. This\nallows you to easily see what
is running in your system, what\nproperties are available for overriding, and
what exact values are for\neach component. OpenEJB has a number of flags that
can be passed to\nit not associated with any particular component, these are
output as\nwell.\n\nAny component configured in OpenEJB via the openejb.xml
(and some that\naren't) can be overridden using system properties. The format
is:\n\n<id>.<property-name>=<property-value>\n\nContent from this file can be
safely copied as-is into the\nconf/system.properties file or sent to the users
list with bug\nreports. Note, however passwords are masked. For more details on
this\ntool, see http://openejb.apache.org/3.0/properties-tool.html
\ No newline at end of file
+cmd.properties.header = OpenEJB Configuration Properties\n\nThe output of this
tool takes all overrideable components OpenEJB sees\nand outputs their
properties along with the current value. This\nallows you to easily see what
is running in your system, what\nproperties are available for overriding, and
what exact values are for\neach component. OpenEJB has a number of flags that
can be passed to\nit not associated with any particular component, these are
output as\nwell.\n\nAny component configured in OpenEJB via the openejb.xml
(and some that\naren't) can be overridden using system properties. The format
is:\n\n<id>.<property-name>=<property-value>\n\nContent from this file can be
safely copied as-is into the\nconf/system.properties file or sent to the users
list with bug\nreports. Note, however passwords are masked. For more details on
this\ntool, see http://tomee.apache.org/3.0/properties-tool.html
\ No newline at end of file
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
Thu Sep 18 14:00:16 2014
@@ -70,7 +70,7 @@ startup.beanInstanceSystemExceptionThrow
# ts = TransactionService
#
-ge0001=FATAL ERROR: Unknown error in {0}. Please send the following stack
trace and this message to us...@openejb.apache.org :\n {1}
+ge0001=FATAL ERROR: Unknown error in {0}. Please send the following stack
trace and this message to us...@tomee.apache.org :\n {1}
# param 0 is the part of the system that needs the Properties object.
ge0002=The required properties object needed by {0} is null.
# param 0 is the properties file name, param 1 is the part of the system
that needs the properties file.
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationValidationTest.java
Thu Sep 18 14:00:16 2014
@@ -48,7 +48,7 @@ import java.util.Set;
* Keeps the Info Objects inline with the concept of a basic AST (Abstract
Syntax Tree)
* which is produced by the ConfigurationFactory and built by the Assembler,
* <p/>
- * See http://openejb.apache.org/configuration-and-assembly.html
+ * See http://tomee.apache.org/configuration-and-assembly.html
*
* @version $Rev$ $Date$
*/
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-openejb-jar.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-openejb-jar.xml?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-openejb-jar.xml
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/daytrader/daytrader-openejb-jar.xml
Thu Sep 18 14:00:16 2014
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1";
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns6="http://java.sun.com/xml/ns/persistence";
xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";>
+<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns3="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns4="http://tomee.apache.org/xml/ns/pkgen-2.1";
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns6="http://java.sun.com/xml/ns/persistence";
xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";>
<ns2:cmp-connection-factory>
<ns2:resource-link>jdbc/TradeDataSource</ns2:resource-link>
</ns2:cmp-connection-factory>
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
Thu Sep 18 14:00:16 2014
@@ -18,10 +18,10 @@
<!-- $Rev$ $Date$ -->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
+<openejb-jar xmlns="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2";>
- <!--xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"-->
+ <!--xmlns:pkgen="http://tomee.apache.org/xml/ns/pkgen-2.1"-->
<environment>
<moduleId>
@@ -708,7 +708,7 @@
<table-column>city</table-column>
</cmp-field-mapping>
<primkey-field>id</primkey-field>
- <!--<key-generator
xmlns="http://openejb.apache.org/xml/ns/pkgen-2.1";>-->
+ <!--<key-generator
xmlns="http://tomee.apache.org/xml/ns/pkgen-2.1";>-->
<!--<auto-increment-table>-->
<!--<sql>insert into sequence_table (dummy) values
(1)</sql>-->
<!--<return-type>java.lang.Integer</return-type>-->
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml
Thu Sep 18 14:00:16 2014
@@ -18,10 +18,10 @@
<!-- $Rev$ $Date$ -->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
+<openejb-jar xmlns="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2";>
- <!--xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"-->
+ <!--xmlns:pkgen="http://tomee.apache.org/xml/ns/pkgen-2.1"-->
<environment>
<moduleId>
@@ -740,7 +740,7 @@
<table-column>city</table-column>
</cmp-field-mapping>
<primkey-field>id</primkey-field>
- <!--<key-generator
xmlns="http://openejb.apache.org/xml/ns/pkgen-2.1";>-->
+ <!--<key-generator
xmlns="http://tomee.apache.org/xml/ns/pkgen-2.1";>-->
<!--<auto-increment-table>-->
<!--<sql>insert into sequence_table (dummy) values
(1)</sql>-->
<!--<return-type>java.lang.Integer</return-type>-->
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/geronimo-openejb.xml
Thu Sep 18 14:00:16 2014
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns5:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns3="http://geronimo.apache.org/xml/ns/openejb-clustering-wadi-1.2";
xmlns:ns4="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns5="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";
xmlns:ns7="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns8="http://java.sun.com/xml/ns/persistence";
xmlns:ns9="http://openejb.apache.org/xml/ns/pkgen-2.1";>
+<ns5:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns3="http://geronimo.apache.org/xml/ns/openejb-clustering-wadi-1.2";
xmlns:ns4="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns5="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";
xmlns:ns7="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns8="http://java.sun.com/xml/ns/persistence";
xmlns:ns9="http://tomee.apache.org/xml/ns/pkgen-2.1";>
<environment>
<moduleId>
<groupId>org.foo</groupId>
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/resources/convert/oej2/simple/openejb-jar.xml
Thu Sep 18 14:00:16 2014
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2";>
+<openejb-jar xmlns="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2";>
<dep:environment>
<dep:moduleId>
<dep:groupId>org.foo</dep:groupId>
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ActivationConfigType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ActivationConfigType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ActivationConfigType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ActivationConfigType.java
Thu Sep 18 14:00:16 2014
@@ -36,7 +36,7 @@ import javax.xml.bind.annotation.XmlType
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
* <sequence>
* <element name="description"
type="{http://www.w3.org/2001/XMLSchema}string"; maxOccurs="unbounded"
minOccurs="0"/>
- * <element name="activation-config-property"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}activation-config-propertyType";
maxOccurs="unbounded"/>
+ * <element name="activation-config-property"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}activation-config-propertyType";
maxOccurs="unbounded"/>
* </sequence>
* </restriction>
* </complexContent>
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AutoIncrementTableType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AutoIncrementTableType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AutoIncrementTableType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AutoIncrementTableType.java
Thu Sep 18 14:00:16 2014
@@ -53,15 +53,15 @@ import javax.xml.bind.annotation.XmlType
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "auto-increment-tableType", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, propOrder = {
+@XmlType(name = "auto-increment-tableType", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, propOrder = {
"sql",
"returnType"
})
public class AutoIncrementTableType {
- @XmlElement(name = "sql", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "sql", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected String sql;
- @XmlElement(name = "return-type", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "return-type", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected String returnType;
/**
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/CustomGeneratorType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/CustomGeneratorType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/CustomGeneratorType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/CustomGeneratorType.java
Thu Sep 18 14:00:16 2014
@@ -47,15 +47,15 @@ import javax.xml.bind.annotation.XmlType
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "custom-generatorType", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, propOrder = {
+@XmlType(name = "custom-generatorType", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, propOrder = {
"generatorName",
"primaryKeyClass"
})
public class CustomGeneratorType {
- @XmlElement(name = "generator-name", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "generator-name", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected String generatorName;
- @XmlElement(name = "primary-key-class", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "primary-key-class", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected String primaryKeyClass;
/**
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DatabaseGeneratedType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DatabaseGeneratedType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DatabaseGeneratedType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/DatabaseGeneratedType.java
Thu Sep 18 14:00:16 2014
@@ -52,12 +52,12 @@ import javax.xml.bind.annotation.XmlType
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "database-generatedType", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, propOrder = {
+@XmlType(name = "database-generatedType", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, propOrder = {
"identityColumn"
})
public class DatabaseGeneratedType {
- @XmlElement(name = "identity-column", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "identity-column", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected List<String> identityColumn;
/**
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EjbRelationType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EjbRelationType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EjbRelationType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EjbRelationType.java
Thu Sep 18 14:00:16 2014
@@ -37,7 +37,7 @@ import javax.xml.bind.annotation.XmlType
* <sequence>
* <element name="ejb-relation-name"
type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/>
* <element name="many-to-many-table-name"
type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/>
- * <element name="ejb-relationship-role"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}ejb-relationship-roleType";
maxOccurs="2"/>
+ * <element name="ejb-relationship-role"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}ejb-relationship-roleType";
maxOccurs="2"/>
* </sequence>
* </restriction>
* </complexContent>
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
Thu Sep 18 14:00:16 2014
@@ -47,7 +47,7 @@ import javax.xml.bind.annotation.adapter
* <element name="ejb-name"
type="{http://www.w3.org/2001/XMLSchema}string"/>
* <element name="jndi-name"
type="{http://www.w3.org/2001/XMLSchema}string"; maxOccurs="unbounded"
minOccurs="0"/>
* <element name="local-jndi-name"
type="{http://www.w3.org/2001/XMLSchema}string"; maxOccurs="unbounded"
minOccurs="0"/>
- * <group
ref="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}tssGroup"; minOccurs="0"/>
+ * <group
ref="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}tssGroup"; minOccurs="0"/>
* <sequence minOccurs="0">
* <element name="table-name"
type="{http://www.w3.org/2001/XMLSchema}string"/>
* <element name="static-sql"
type="{http://geronimo.apache.org/xml/ns/deployment-1.2}emptyType";
minOccurs="0"/>
@@ -67,16 +67,16 @@ import javax.xml.bind.annotation.adapter
* </complexType>
* </element>
* <element name="primkey-field"
type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/>
- * <element
ref="{http://openejb.apache.org/xml/ns/pkgen-2.1}key-generator"; minOccurs="0"/>
+ * <element
ref="{http://tomee.apache.org/xml/ns/pkgen-2.1}key-generator"; minOccurs="0"/>
* <element name="prefetch-group" minOccurs="0">
* <complexType>
* <complexContent>
* <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType";>
* <sequence>
- * <element name="group"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}groupType";
maxOccurs="unbounded" minOccurs="0"/>
- * <element name="entity-group-mapping"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}entity-group-mappingType";
minOccurs="0"/>
- * <element name="cmp-field-group-mapping"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}cmp-field-group-mappingType";
maxOccurs="unbounded" minOccurs="0"/>
- * <element name="cmr-field-group-mapping"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}cmr-field-group-mappingType";
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="group"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}groupType";
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="entity-group-mapping"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}entity-group-mappingType";
minOccurs="0"/>
+ * <element name="cmp-field-group-mapping"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}cmp-field-group-mappingType";
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="cmr-field-group-mapping"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}cmr-field-group-mappingType";
maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
@@ -105,7 +105,7 @@ import javax.xml.bind.annotation.adapter
* </complexType>
* </element>
* <group
ref="{http://geronimo.apache.org/xml/ns/naming-1.2}jndiEnvironmentRefsGroup"/>
- * <element name="query"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}queryType";
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="query"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}queryType";
maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
* </restriction>
@@ -172,7 +172,7 @@ public class EntityBeanType implements E
@XmlElement(name = "primkey-field")
protected String primkeyField;
- @XmlElement(name = "key-generator", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";)
+ @XmlElement(name = "key-generator", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";)
protected KeyGeneratorType keyGenerator;
@XmlElement(name = "prefetch-group")
@@ -966,10 +966,10 @@ public class EntityBeanType implements E
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
* <sequence>
- * <element name="group"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}groupType";
maxOccurs="unbounded" minOccurs="0"/>
- * <element name="entity-group-mapping"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}entity-group-mappingType";
minOccurs="0"/>
- * <element name="cmp-field-group-mapping"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}cmp-field-group-mappingType";
maxOccurs="unbounded" minOccurs="0"/>
- * <element name="cmr-field-group-mapping"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}cmr-field-group-mappingType";
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="group"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}groupType";
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="entity-group-mapping"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}entity-group-mappingType";
minOccurs="0"/>
+ * <element name="cmp-field-group-mapping"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}cmp-field-group-mappingType";
maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="cmr-field-group-mapping"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}cmr-field-group-mappingType";
maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/KeyGeneratorType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/KeyGeneratorType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/KeyGeneratorType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/KeyGeneratorType.java
Thu Sep 18 14:00:16 2014
@@ -40,10 +40,10 @@ import javax.xml.bind.annotation.XmlType
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
* <choice>
* <element name="uuid"
type="{http://geronimo.apache.org/xml/ns/deployment-1.2}emptyType"/>
- * <element name="sequence-table"
type="{http://openejb.apache.org/xml/ns/pkgen-2.1}sequence-tableType"/>
- * <element name="auto-increment-table"
type="{http://openejb.apache.org/xml/ns/pkgen-2.1}auto-increment-tableType"/>
- * <element name="sql-generator"
type="{http://openejb.apache.org/xml/ns/pkgen-2.1}sql-generatorType"/>
- * <element name="custom-generator"
type="{http://openejb.apache.org/xml/ns/pkgen-2.1}custom-generatorType"/>
+ * <element name="sequence-table"
type="{http://tomee.apache.org/xml/ns/pkgen-2.1}sequence-tableType"/>
+ * <element name="auto-increment-table"
type="{http://tomee.apache.org/xml/ns/pkgen-2.1}auto-increment-tableType"/>
+ * <element name="sql-generator"
type="{http://tomee.apache.org/xml/ns/pkgen-2.1}sql-generatorType"/>
+ * <element name="custom-generator"
type="{http://tomee.apache.org/xml/ns/pkgen-2.1}custom-generatorType"/>
* </choice>
* </restriction>
* </complexContent>
@@ -51,7 +51,7 @@ import javax.xml.bind.annotation.XmlType
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "key-generatorType", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, propOrder = {
+@XmlType(name = "key-generatorType", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, propOrder = {
"uuid",
"sequenceTable",
"autoIncrementTable",
@@ -60,15 +60,15 @@ import javax.xml.bind.annotation.XmlType
})
public class KeyGeneratorType {
- @XmlElement(name = "uuid", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";)
+ @XmlElement(name = "uuid", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";)
protected EmptyType uuid;
- @XmlElement(name = "sequence-table", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";)
+ @XmlElement(name = "sequence-table", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";)
protected SequenceTableType sequenceTable;
- @XmlElement(name = "auto-increment-table", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";)
+ @XmlElement(name = "auto-increment-table", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";)
protected AutoIncrementTableType autoIncrementTable;
- @XmlElement(name = "sql-generator", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";)
+ @XmlElement(name = "sql-generator", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";)
protected SqlGeneratorType sqlGenerator;
- @XmlElement(name = "custom-generator", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";)
+ @XmlElement(name = "custom-generator", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";)
protected CustomGeneratorType customGenerator;
/**
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
Thu Sep 18 14:00:16 2014
@@ -48,7 +48,7 @@ import javax.xml.bind.annotation.adapter
* <sequence>
* <element name="ejb-name"
type="{http://www.w3.org/2001/XMLSchema}string"/>
* <element
ref="{http://geronimo.apache.org/xml/ns/naming-1.2}resource-adapter"/>
- * <element name="activation-config"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}activation-configType";
minOccurs="0"/>
+ * <element name="activation-config"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}activation-configType";
minOccurs="0"/>
* <group
ref="{http://geronimo.apache.org/xml/ns/naming-1.2}jndiEnvironmentRefsGroup"/>
* </sequence>
* <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
Thu Sep 18 14:00:16 2014
@@ -41,8 +41,8 @@ public class NamespaceFilter extends XML
ns.put("alt-dd",
"http://geronimo.apache.org/xml/ns/j2ee/application-1.2";);
ns.put("application",
"http://geronimo.apache.org/xml/ns/j2ee/application-1.2";);
ns.put("attribute",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
- ns.put("auto-increment-table",
"http://openejb.apache.org/xml/ns/pkgen-2.1";);
- ns.put("batch-size", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("auto-increment-table",
"http://tomee.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("batch-size", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("binding-name", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("client-environment",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("clustering",
"http://geronimo.apache.org/xml/ns/j2ee/application-1.2";);
@@ -51,7 +51,7 @@ public class NamespaceFilter extends XML
ns.put("credentials-name",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("css", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("css-link", "http://geronimo.apache.org/xml/ns/naming-1.2";);
- ns.put("custom-generator",
"http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("custom-generator", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("dependencies",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("dependency",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("ejb",
"http://geronimo.apache.org/xml/ns/j2ee/application-1.2";);
@@ -65,16 +65,16 @@ public class NamespaceFilter extends XML
ns.put("gbean", "http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("gbean-link", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("gbean-ref", "http://geronimo.apache.org/xml/ns/naming-1.2";);
- ns.put("generator-name", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("generator-name", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("hidden-classes",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("host", "http://geronimo.apache.org/xml/ns/naming-1.2";);
- ns.put("identity-column",
"http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("identity-column", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("import", "http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("internal-path",
"http://geronimo.apache.org/xml/ns/j2ee/application-1.2";);
ns.put("inverse-classloading",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("java",
"http://geronimo.apache.org/xml/ns/j2ee/application-1.2";);
ns.put("key", "http://geronimo.apache.org/xml/ns/naming-1.2";);
- ns.put("key-generator", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("key-generator", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("message-destination",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("message-destination-link",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("message-destination-name",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
@@ -90,7 +90,7 @@ public class NamespaceFilter extends XML
ns.put("port", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("port-completion",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("port-name", "http://geronimo.apache.org/xml/ns/naming-1.2";);
- ns.put("primary-key-class",
"http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("primary-key-class",
"http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("private-classes",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("property", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("protocol", "http://geronimo.apache.org/xml/ns/naming-1.2";);
@@ -102,23 +102,23 @@ public class NamespaceFilter extends XML
ns.put("resource-env-ref",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("resource-link",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("resource-ref", "http://geronimo.apache.org/xml/ns/naming-1.2";);
- ns.put("return-type", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("return-type", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("security", "http://geronimo.apache.org/xml/ns/security-2.0";);
- ns.put("sequence-name", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
- ns.put("sequence-table", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("sequence-name", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("sequence-table", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("server-environment",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("service", "http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("service-completion",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("service-name", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("service-ref", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("service-ref-name",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
- ns.put("sql", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
- ns.put("sql-generator", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("sql", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("sql-generator", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("suppress-default-environment",
"http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("type", "http://geronimo.apache.org/xml/ns/deployment-1.2";);
ns.put("uri", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("url", "http://geronimo.apache.org/xml/ns/naming-1.2";);
- ns.put("uuid", "http://openejb.apache.org/xml/ns/pkgen-2.1";);
+ ns.put("uuid", "http://tomee.apache.org/xml/ns/pkgen-2.1";);
ns.put("value", "http://geronimo.apache.org/xml/ns/naming-1.2";);
ns.put("web",
"http://geronimo.apache.org/xml/ns/j2ee/application-1.2";);
ns.put("web-container",
"http://geronimo.apache.org/xml/ns/naming-1.2";);
@@ -136,7 +136,7 @@ public class NamespaceFilter extends XML
duplicates.put("name",
Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2";,
"http://geronimo.apache.org/xml/ns/naming-1.2";,
"http://geronimo.apache.org/xml/ns/security-2.0";));
duplicates.put("pattern",
Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2";,
"http://geronimo.apache.org/xml/ns/naming-1.2";));
duplicates.put("version",
Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2";,
"http://geronimo.apache.org/xml/ns/naming-1.2";));
- duplicates.put("table-name",
Arrays.asList("http://openejb.apache.org/xml/ns/openejb-jar-2.2";,
"http://openejb.apache.org/xml/ns/pkgen-2.1";));
+ duplicates.put("table-name",
Arrays.asList("http://tomee.apache.org/xml/ns/openejb-jar-2.2";,
"http://tomee.apache.org/xml/ns/pkgen-2.1";));
}
public NamespaceFilter(final XMLReader xmlReader) {
@@ -153,18 +153,18 @@ public class NamespaceFilter extends XML
//String uri, String localName, String qName, Attributes atts
public void startElement(String uri, final String localName, final String
qname, final Attributes atts) throws SAXException {
- if (uri.startsWith("http://openejb.apache.org/xml/ns/openejb-jar-2";)) {
- uri = "http://openejb.apache.org/xml/ns/openejb-jar-2.2";;
+ if (uri.startsWith("http://tomee.apache.org/xml/ns/openejb-jar-2";)) {
+ uri = "http://tomee.apache.org/xml/ns/openejb-jar-2.2";;
} else if
(uri.startsWith("http://www.openejb.org/xml/ns/openejb-jar-2";)) {
- uri = "http://openejb.apache.org/xml/ns/openejb-jar-2.2";;
+ uri = "http://tomee.apache.org/xml/ns/openejb-jar-2.2";;
} else if (uri.startsWith("http://openejb.org/xml/ns/openejb-jar-2";)) {
- uri = "http://openejb.apache.org/xml/ns/openejb-jar-2.2";;
- } else if (uri.startsWith("http://openejb.apache.org/xml/ns/pkgen-2";))
{
- uri = "http://openejb.apache.org/xml/ns/pkgen-2.1";;
+ uri = "http://tomee.apache.org/xml/ns/openejb-jar-2.2";;
+ } else if (uri.startsWith("http://tomee.apache.org/xml/ns/pkgen-2";)) {
+ uri = "http://tomee.apache.org/xml/ns/pkgen-2.1";;
} else if (uri.startsWith("http://www.openejb.org/xml/ns/pkgen-2";)) {
- uri = "http://openejb.apache.org/xml/ns/pkgen-2.1";;
+ uri = "http://tomee.apache.org/xml/ns/pkgen-2.1";;
} else if (uri.startsWith("http://openejb.org/xml/ns/pkgen-2";)) {
- uri = "http://openejb.apache.org/xml/ns/pkgen-2.1";;
+ uri = "http://tomee.apache.org/xml/ns/pkgen-2.1";;
} else if
(uri.startsWith("http://geronimo.apache.org/xml/ns/deployment-1";)) {
uri = "http://geronimo.apache.org/xml/ns/deployment-1.2";;
} else if
(uri.startsWith("http://geronimo.apache.org/xml/ns/j2ee/application-1";)) {
@@ -178,7 +178,7 @@ public class NamespaceFilter extends XML
final String previousNs = visibleNamespaces.peek();
final String correctNamespace = ns.get(localName);
- final boolean correctable =
(uri.equals("http://openejb.apache.org/xml/ns/openejb-jar-2.2";) ||
uri.equals("http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";));
+ final boolean correctable =
(uri.equals("http://tomee.apache.org/xml/ns/openejb-jar-2.2";) ||
uri.equals("http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";));
if (correctable && correctNamespace != null) {
uri = correctNamespace;
} else if (duplicates.containsKey(localName)) {
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
Thu Sep 18 14:00:16 2014
@@ -54,7 +54,7 @@ public class ObjectFactory {
private final static QName _MessageDestination_QNAME = new
QName("http://geronimo.apache.org/xml/ns/naming-1.2";, "message-destination");
private final static QName _Module_QNAME = new
QName("http://geronimo.apache.org/xml/ns/deployment-1.2";, "module");
private final static QName _Clustering_QNAME = new
QName("http://geronimo.apache.org/xml/ns/j2ee/application-1.2";, "clustering");
- private final static QName _KeyGenerator_QNAME = new
QName("http://openejb.apache.org/xml/ns/pkgen-2.1";, "key-generator");
+ private final static QName _KeyGenerator_QNAME = new
QName("http://tomee.apache.org/xml/ns/pkgen-2.1";, "key-generator");
private final static QName _Environment_QNAME = new
QName("http://geronimo.apache.org/xml/ns/deployment-1.2";, "environment");
private final static QName _Security_QNAME = new
QName("http://geronimo.apache.org/xml/ns/j2ee/application-1.2";, "security");
private final static QName _Security2_QNAME = new
QName("http://geronimo.apache.org/xml/ns/security-2.0";, "security");
@@ -68,7 +68,7 @@ public class ObjectFactory {
private final static QName _CmpConnectionFactory_QNAME = new
QName("http://geronimo.apache.org/xml/ns/naming-1.2";, "cmp-connection-factory");
private final static QName _ClientEnvironment_QNAME = new
QName("http://geronimo.apache.org/xml/ns/deployment-1.2";, "client-environment");
private final static QName _GbeanRef_QNAME = new
QName("http://geronimo.apache.org/xml/ns/naming-1.2";, "gbean-ref");
- private final static QName _OpenejbJar_QNAME = new
QName("http://openejb.apache.org/xml/ns/openejb-jar-2.2";, "openejb-jar");
+ private final static QName _OpenejbJar_QNAME = new
QName("http://tomee.apache.org/xml/ns/openejb-jar-2.2";, "openejb-jar");
private final static QName _EjbRef_QNAME = new
QName("http://geronimo.apache.org/xml/ns/naming-1.2";, "ejb-ref");
private final static QName _WebContainer_QNAME = new
QName("http://geronimo.apache.org/xml/ns/naming-1.2";, "web-container");
private final static QName _OpenejbClusteringWadi_QNAME = new
QName("http://geronimo.apache.org/xml/ns/openejb-clustering-wadi-1.2";,
"openejb-clustering-wadi");
@@ -630,7 +630,7 @@ public class ObjectFactory {
/**
* Create an instance of {@link JAXBElement }{@code <}{@link
KeyGeneratorType }{@code >}}
*/
- @XmlElementDecl(namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1";,
name = "key-generator")
+ @XmlElementDecl(namespace = "http://tomee.apache.org/xml/ns/pkgen-2.1";,
name = "key-generator")
public JAXBElement<KeyGeneratorType> createKeyGenerator(final
KeyGeneratorType value) {
return new JAXBElement<KeyGeneratorType>(_KeyGenerator_QNAME,
KeyGeneratorType.class, null, value);
}
@@ -748,7 +748,7 @@ public class ObjectFactory {
/**
* Create an instance of {@link JAXBElement }{@code <}{@link
OpenejbJarType }{@code >}}
*/
- @XmlElementDecl(namespace =
"http://openejb.apache.org/xml/ns/openejb-jar-2.2";, name = "openejb-jar")
+ @XmlElementDecl(namespace =
"http://tomee.apache.org/xml/ns/openejb-jar-2.2";, name = "openejb-jar")
public JAXBElement<OpenejbJarType> createOpenejbJar(final OpenejbJarType
value) {
return new JAXBElement<OpenejbJarType>(_OpenejbJar_QNAME,
OpenejbJarType.class, null, value);
}
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
Thu Sep 18 14:00:16 2014
@@ -54,15 +54,15 @@ import org.apache.openejb.jee.oejb3.Prop
* <complexContent>
* <restriction
base="{http://www.w3.org/2001/XMLSchema}anyType";>
* <choice maxOccurs="unbounded" minOccurs="0">
- * <element name="session"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}session-beanType"/>
- * <element name="entity"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}entity-beanType"/>
- * <element name="message-driven"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}message-driven-beanType"/>
+ * <element name="session"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}session-beanType"/>
+ * <element name="entity"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}entity-beanType"/>
+ * <element name="message-driven"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}message-driven-beanType"/>
* </choice>
* </restriction>
* </complexContent>
* </complexType>
* </element>
- * <element name="relationships"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}relationshipsType";
minOccurs="0"/>
+ * <element name="relationships"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}relationshipsType";
minOccurs="0"/>
* <element
ref="{http://geronimo.apache.org/xml/ns/naming-1.2}message-destination";
maxOccurs="unbounded" minOccurs="0"/>
* <element
ref="{http://geronimo.apache.org/xml/ns/j2ee/application-1.2}security";
minOccurs="0"/>
* <element
ref="{http://geronimo.apache.org/xml/ns/deployment-1.2}service";
maxOccurs="unbounded" minOccurs="0"/>
@@ -73,7 +73,7 @@ import org.apache.openejb.jee.oejb3.Prop
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "openejb-jarType", namespace =
"http://openejb.apache.org/xml/ns/openejb-jar-2.2";, propOrder = {
+@XmlType(name = "openejb-jarType", namespace =
"http://tomee.apache.org/xml/ns/openejb-jar-2.2";, propOrder = {
"environment",
"properties",
"cmpConnectionFactory",
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java
Thu Sep 18 14:00:16 2014
@@ -47,18 +47,18 @@ import javax.xml.bind.annotation.XmlType
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sequence-tableType", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, propOrder = {
+@XmlType(name = "sequence-tableType", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, propOrder = {
"tableName",
"sequenceName",
"batchSize"
})
public class SequenceTableType {
- @XmlElement(name = "table-name", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "table-name", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected String tableName;
- @XmlElement(name = "sequence-name", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "sequence-name", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected String sequenceName;
- @XmlElement(name = "batch-size", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";)
+ @XmlElement(name = "batch-size", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";)
protected int batchSize;
/**
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
Thu Sep 18 14:00:16 2014
@@ -48,11 +48,11 @@ import javax.xml.bind.annotation.adapter
* <element name="jndi-name"
type="{http://www.w3.org/2001/XMLSchema}string"; maxOccurs="unbounded"
minOccurs="0"/>
* <element name="local-jndi-name"
type="{http://www.w3.org/2001/XMLSchema}string"; maxOccurs="unbounded"
minOccurs="0"/>
* <element name="cache-size"
type="{http://www.w3.org/2001/XMLSchema}int"; minOccurs="0"/>
- * <group
ref="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}tssGroup"; minOccurs="0"/>
+ * <group
ref="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}tssGroup"; minOccurs="0"/>
* <group
ref="{http://geronimo.apache.org/xml/ns/naming-1.2}jndiEnvironmentRefsGroup"/>
* <element name="web-service-address"
type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/>
* <element name="web-service-virtual-host"
type="{http://www.w3.org/2001/XMLSchema}string"; maxOccurs="unbounded"
minOccurs="0"/>
- * <element name="web-service-security"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}web-service-securityType";
minOccurs="0"/>
+ * <element name="web-service-security"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}web-service-securityType";
minOccurs="0"/>
* </sequence>
* <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID"; />
* </restriction>
@@ -96,7 +96,7 @@ public class SessionBeanType implements
protected Integer cacheSize;
@XmlElement(name = "tss-link")
protected String tssLink;
- @XmlElement(name = "tss", namespace =
"http://openejb.apache.org/xml/ns/openejb-jar-2.2";)
+ @XmlElement(name = "tss", namespace =
"http://tomee.apache.org/xml/ns/openejb-jar-2.2";)
protected PatternType tss;
@XmlElement(name = "properties")
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java
Thu Sep 18 14:00:16 2014
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sql-generatorType", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, propOrder = {
+@XmlType(name = "sql-generatorType", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, propOrder = {
"sql",
"returnType"
})
public class SqlGeneratorType {
- @XmlElement(name = "sql", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "sql", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected String sql;
- @XmlElement(name = "return-type", namespace =
"http://openejb.apache.org/xml/ns/pkgen-2.1";, required = true)
+ @XmlElement(name = "return-type", namespace =
"http://tomee.apache.org/xml/ns/pkgen-2.1";, required = true)
protected String returnType;
/**
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java
Thu Sep 18 14:00:16 2014
@@ -42,8 +42,8 @@ import org.apache.openejb.jee.oejb3.Prop
* <sequence>
* <element name="security-realm-name"
type="{http://www.w3.org/2001/XMLSchema}string"/>
* <element name="realm-name"
type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/>
- * <element name="transport-guarantee"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}transport-guaranteeType"/>
- * <element name="auth-method"
type="{http://openejb.apache.org/xml/ns/openejb-jar-2.2}auth-methodType"/>
+ * <element name="transport-guarantee"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}transport-guaranteeType"/>
+ * <element name="auth-method"
type="{http://tomee.apache.org/xml/ns/openejb-jar-2.2}auth-methodType"/>
* <element name="http-method"
type="{http://www.w3.org/2001/XMLSchema}string"; maxOccurs="unbounded"
minOccurs="0"/>
* </sequence>
* </restriction>
Modified:
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java
Thu Sep 18 14:00:16 2014
@@ -16,11 +16,11 @@
*/
@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(value =
javax.xml.bind.annotation.adapters.CollapsedStringAdapter.class, type =
String.class)
@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2";,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+ namespace = "http://tomee.apache.org/xml/ns/openejb-jar-2.2";,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
xmlns = {
- @javax.xml.bind.annotation.XmlNs(prefix = "o", namespaceURI =
"http://openejb.apache.org/xml/ns/openejb-jar-2.2";),
+ @javax.xml.bind.annotation.XmlNs(prefix = "o", namespaceURI =
"http://tomee.apache.org/xml/ns/openejb-jar-2.2";),
@javax.xml.bind.annotation.XmlNs(prefix = "sys", namespaceURI =
"http://geronimo.apache.org/xml/ns/deployment-1.2";),
- @javax.xml.bind.annotation.XmlNs(prefix = "pkgen", namespaceURI =
"http://openejb.apache.org/xml/ns/pkgen-2.1";),
+ @javax.xml.bind.annotation.XmlNs(prefix = "pkgen", namespaceURI =
"http://tomee.apache.org/xml/ns/pkgen-2.1";),
@javax.xml.bind.annotation.XmlNs(prefix = "naming", namespaceURI =
"http://geronimo.apache.org/xml/ns/naming-1.2";),
@javax.xml.bind.annotation.XmlNs(prefix = "app", namespaceURI =
"http://geronimo.apache.org/xml/ns/j2ee/application-1.2";),
@javax.xml.bind.annotation.XmlNs(prefix = "secu", namespaceURI =
"http://geronimo.apache.org/xml/ns/security-2.0";)
Modified:
tomee/tomee/trunk/container/openejb-jee/src/test/resources/daytrader-corrected.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/test/resources/daytrader-corrected.xml?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/test/resources/daytrader-corrected.xml
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/test/resources/daytrader-corrected.xml
Thu Sep 18 14:00:16 2014
@@ -19,7 +19,7 @@
<!-- $Rev$ $Date$ -->
-<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1";
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns7="http://java.sun.com/xml/ns/persistence";
xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";>
+<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns3="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns4="http://tomee.apache.org/xml/ns/pkgen-2.1";
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns7="http://java.sun.com/xml/ns/persistence";
xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";>
<ns2:cmp-connection-factory>
<ns2:resource-link>jdbc/TradeDataSource</ns2:resource-link>
</ns2:cmp-connection-factory>
Modified:
tomee/tomee/trunk/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml?rev=1625982&r1=1625981&r2=1625982&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
(original)
+++
tomee/tomee/trunk/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
Thu Sep 18 14:00:16 2014
@@ -19,7 +19,7 @@
<!-- $Rev$ $Date$ -->
-<ns4:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns7="http://java.sun.com/xml/ns/persistence";
xmlns:ns8="http://openejb.apache.org/xml/ns/pkgen-2.1";>
+<ns4:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns3="http://tomee.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns7="http://java.sun.com/xml/ns/persistence";
xmlns:ns8="http://tomee.apache.org/xml/ns/pkgen-2.1";>
<environment>
<moduleId>
<groupId>String</groupId>
