You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2007/07/16 22:27:50 UTC
svn commit: r556721 - in /openejb/trunk/openejb3: ./
assembly/openejb-itests-webapp/src/main/webapp/META-INF/
container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/alt/
container/openejb-core/src/main/java/org/apache/openejb/c...
Author: dain
Date: Mon Jul 16 13:27:48 2007
New Revision: 556721
URL: http://svn.apache.org/viewvc?view=rev&rev=556721
Log:
Removed dependency on castor
Removed:
openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/cmp.mapping.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/
openejb/trunk/openejb3/examples/moviefun/src/main/webapp/META-INF/cmp.global-database.xml
openejb/trunk/openejb3/examples/moviefun/src/main/webapp/META-INF/cmp.local-database.xml
openejb/trunk/openejb3/examples/moviefun/src/main/webapp/META-INF/cmp.or-mapping.xml
openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/cmp.mapping.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/log4j.properties
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarUtils.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf
openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb-jar.xsd
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
openejb/trunk/openejb3/examples/moviefun/src/main/webapp/META-INF/log4j.properties
openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
openejb/trunk/openejb3/pom.xml
Modified: openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/log4j.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/log4j.properties?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/log4j.properties (original)
+++ openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/log4j.properties Mon Jul 16 13:27:48 2007
@@ -49,9 +49,6 @@
log4j.category.OpenEJB = warn, R
log4j.category.OpenEJB.startup = debug
-log4j.category.OpenEJB.CastorCMP = warn
-log4j.category.CastorCMP = warn, R
-log4j.category.org.exolab.castor = debug, R
log4j.category.openejb = warn, R
log4j.appender.R = org.apache.log4j.RollingFileAppender
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Mon Jul 16 13:27:48 2007
@@ -200,24 +200,6 @@
</dependency>
<!-- End ActiveMQ -->
<dependency>
- <groupId>org.codehaus.castor</groupId>
- <artifactId>castor</artifactId>
- </dependency>
- <!-- these are for castor, should be added to its pom.xml -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
- <!-- end castor deps -->
- <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
</dependency>
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarUtils.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarUtils.java?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarUtils.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarUtils.java Mon Jul 16 13:27:48 2007
@@ -98,12 +98,7 @@
}
public void writeEjbJar(String xmlFile) throws OpenEJBException {
-// /* TODO: Just to be picky, the xml file created by
-// Castor is really hard to read -- it is all on one line.
-// People might want to edit this in the future by hand, so if Castor can
-// make the output look better that would be great! Otherwise we could
-// just spruce the output up by adding a few new lines and tabs.
-// */
+// todo rewrite using JaxB or remove
// Writer writer = null;
// try {
// File file = new File(xmlFile);
@@ -271,12 +266,7 @@
}
public static void writeOpenejbJar(String xmlFile, OpenejbJar openejbJarObject) throws OpenEJBException {
-// /* TODO: Just to be picky, the xml file created by
-// Castor is really hard to read -- it is all on one line.
-// People might want to edit this in the future by hand, so if Castor can
-// make the output look better that would be great! Otherwise we could
-// just spruce the output up by adding a few new lines and tabs.
-// */
+// todo rewrite using JaxB or remove
// Writer writer = null;
// try {
// File file = new File(xmlFile);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java Mon Jul 16 13:27:48 2007
@@ -773,13 +773,6 @@
private org.apache.log4j.Logger doFallbackConfiguration() {
set("org.apache.activemq", Level.INFO);
set("openjpa", Level.WARN);
- set("CastorCMP", Level.ERROR);
- set("org.exolab.castor", Level.ERROR);
- java.util.logging.Logger.getLogger("org.exolab.castor.jdo.engine.DatabaseImpl").setLevel(java.util.logging.Level.SEVERE);
- set("org.exolab.castor.jdo.engine.DatabaseImpl", Level.ERROR);
- //org/exolab/castor.jdo.engine.DatabaseImpl
- set("org.castor", Level.ERROR);
- set("org.apache.openejb", Level.WARN);
set("Transaction", Level.WARN);
set("OpenEJB.startup", Level.INFO);
set("OpenEJB.startup.config", Level.WARN);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Mon Jul 16 13:27:48 2007
@@ -53,7 +53,6 @@
constructor="id, transactionManager, securityService, CmpEngineFactory, Engine, ConnectorName"
class-name="org.apache.openejb.core.cmp.CmpContainer">
- #CmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
#Engine derby
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml Mon Jul 16 13:27:48 2007
@@ -78,7 +78,6 @@
<o:cmpContainer id="Default CMP Container" depends-on="jndiBinding">
id=Default CMP Container
- #cmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
cmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
engine derby
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml Mon Jul 16 13:27:48 2007
@@ -75,7 +75,6 @@
<o:cmpContainer id="Default CMP Container" depends-on="jndiBinding">
id=Default CMP Container
- #cmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
cmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
engine derby
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf Mon Jul 16 13:27:48 2007
@@ -50,10 +50,6 @@
log4j.category.OpenEJB = warn, R
log4j.category.OpenEJB.server = info, R
log4j.category.OpenEJB.startup = debug
-log4j.category.OpenEJB.CastorCMP = warn
-log4j.category.CastorCMP = error, R
-log4j.category.org.exolab.castor = error, R
-log4j.category.org.castor = error, R
log4j.category.CORBA-Adapter = debug, R
log4j.category.Transaction = warn, TX
log4j.category.org.apache.activemq = error, R
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb-jar.xsd
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb-jar.xsd?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb-jar.xsd (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb-jar.xsd Mon Jul 16 13:27:48 2007
@@ -171,12 +171,11 @@
<xsd:element name="description" type="xsd:string"/>
<!--
- An OQL query string. The OQL syntax is a subset of the syntax
- described in the ODMG 3.0 specification section 4.12, with some
- additional constructs.
-
- Full details of the OQL Syntax at:
- http://www.castor.org/oql.html
+ A CMP container specific query string for query method. Typically,
+ this is EJB-QL, but can be any query supported by the CMP
+ container implementation. The EHB-QL syntax is defined in JSR
+ 220: Enterprise JavaBeansTM, Version 3.0: Java Persistence API
+ chapter 4.
Used in: query
-->
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java Mon Jul 16 13:27:48 2007
@@ -79,8 +79,7 @@
// TODO: This needs fixing... containers are supposed to be pluggable
// assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.stateless", springAssembler, dynamicAssembler);
// assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.stateful", springAssembler, dynamicAssembler);
-// assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.entity", "org.apache.openejb.alt.containers.castor_cmp11", springAssembler, dynamicAssembler);
-// assertNotDependentOn("org.apache.openejb", "org.apache.openejb.alt.containers.castor_cmp11", springAssembler, dynamicAssembler);
+// assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.entity", springAssembler, dynamicAssembler);
}
private void assertNotDependentOn(String referringPacakge, String referredPackage, String... exemptionsArray) {
Modified: openejb/trunk/openejb3/examples/moviefun/src/main/webapp/META-INF/log4j.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/moviefun/src/main/webapp/META-INF/log4j.properties?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/examples/moviefun/src/main/webapp/META-INF/log4j.properties (original)
+++ openejb/trunk/openejb3/examples/moviefun/src/main/webapp/META-INF/log4j.properties Mon Jul 16 13:27:48 2007
@@ -33,9 +33,6 @@
log4j.category.OpenEJB = warn, R
log4j.category.OpenEJB.startup = debug
-log4j.category.OpenEJB.CastorCMP = warn
-log4j.category.CastorCMP = warn, R
-log4j.category.org.exolab.castor = debug, R
log4j.appender.R = org.apache.log4j.RollingFileAppender
log4j.appender.R.File = openejb.log
Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml Mon Jul 16 13:27:48 2007
@@ -53,11 +53,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- </dependency>
<dependency>
<groupId>xerces</groupId>
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?view=diff&rev=556721&r1=556720&r2=556721
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Mon Jul 16 13:27:48 2007
@@ -243,49 +243,6 @@
<version>2.2.3</version>
</dependency>
<dependency>
- <groupId>org.codehaus.castor</groupId>
- <artifactId>castor</artifactId>
- <version>1.0.5</version>
- <exclusions>
- <exclusion>
- <groupId>adaptx</groupId>
- <artifactId>adaptx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.cenqua.clover</groupId>
- <artifactId>clover</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ldapsdk</groupId>
- <artifactId>ldapsdk</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
@@ -906,11 +863,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
<groupId>qdox</groupId>
<artifactId>qdox</artifactId>
<version>1.6</version>
@@ -919,11 +871,6 @@
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>