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/17 03:04:01 UTC
svn commit: r556783 - in /openejb/trunk/openejb3: ./ container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/resource/
container/openejb-core/src/main/resources/META-INF/org.apache.openejb/
container/openejb-core/src/test/java/o...
Author: dain
Date: Mon Jul 16 18:04:00 2007
New Revision: 556783
URL: http://svn.apache.org/viewvc?view=rev&rev=556783
Log:
Removed lingering spring dependencies
Removed:
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
Modified:
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
openejb/trunk/openejb3/pom.xml
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=556783&r1=556782&r2=556783
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Mon Jul 16 18:04:00 2007
@@ -341,25 +341,6 @@
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
-
- <!--
- FIXME: Why should it be specified here? Shouldn't xbean download what's necessary?
- -->
- <!--
- TODO: Bump up the version to the latest 2.0 release once XBean accepts it
- Impossible now as XBean reports NoClassDefFoundError due to the class re-packaging
- Caused by: java.lang.NoClassDefFoundError: org/springframework/beans/factory/support/ComponentDefinition
- at java.lang.Class.forName0(Native Method)
- at java.lang.Class.forName(Class.java:164)
- at org.apache.xbean.spring.context.v2.XBeanV2Helper.createNamespaceHandler(XBeanV2Helper.java:45)
- ... 33 more
- -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <!-- END: Spring dependencies -->
-
</dependencies>
</project>
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java?view=diff&rev=556783&r1=556782&r2=556783
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java Mon Jul 16 18:04:00 2007
@@ -29,8 +29,6 @@
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
-import org.springframework.beans.FatalBeanException;
-
import javax.transaction.TransactionManager;
public class GeronimoConnectionManagerFactory {
@@ -176,7 +174,7 @@
} else if ("xa".equalsIgnoreCase(transactionSupport)) {
return new XATransactions(true, false);
} else {
- throw new FatalBeanException("Unknown transaction type " + transactionSupport);
+ throw new IllegalArgumentException("Unknown transaction type " + transactionSupport);
}
}
@@ -223,7 +221,7 @@
false,
true);
} else {
- throw new FatalBeanException("Unknown partition strategy " + partitionStrategy);
+ throw new IllegalArgumentException("Unknown partition strategy " + partitionStrategy);
}
}
}
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=556783&r1=556782&r2=556783
==============================================================================
--- 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 18:04:00 2007
@@ -55,13 +55,9 @@
depsOfPackages = dependencyVisitor.groups;
- // Nothing may depend on the Assembler except the config code or spring assembler
- String springAssembler = "org.apache.openejb.assembler.spring";
+ // Nothing may depend on the Assembler except the config code
String dynamicAssembler = "org.apache.openejb.assembler.dynamic";
- assertNotDependentOn("org.apache.openejb", "org.apache.openejb.assembler.classic", "org.apache.openejb.assembler", "org.apache.openejb.config", springAssembler, "org.apache.openejb.assembler.dynamic");
-
- // Nothing may depend on the Spring Assembler
- assertNotDependentOn("org.apache.openejb", springAssembler);
+ assertNotDependentOn("org.apache.openejb", "org.apache.openejb.assembler.classic", "org.apache.openejb.assembler", "org.apache.openejb.config", "org.apache.openejb.assembler.dynamic");
// Nothing may depend on the Dynamic Assembler
assertNotDependentOn("org.apache.openejb", dynamicAssembler);
@@ -69,17 +65,17 @@
// Nothing may depend on the JAXB Tree except the Config code
assertNotDependentOn("org.apache.openejb", "org.apache.openejb.jee", "org.apache.openejb.config", "org.apache.openejb.config.rules");
- // Nothing may depend on the Config code except it's subpackages and the Spring Assembler
- assertNotDependentOn("org.apache.openejb", "org.apache.openejb.config", "org.apache.openejb.config.rules", "org.apache.openejb.config.sys", "org.apache.openejb.assembler", springAssembler, dynamicAssembler);
+ // Nothing may depend on the Config code except it's subpackages
+ assertNotDependentOn("org.apache.openejb", "org.apache.openejb.config", "org.apache.openejb.config.rules", "org.apache.openejb.config.sys", "org.apache.openejb.assembler", dynamicAssembler);
// The assembler may not be dependent on the config factory Implementation
assertNotDependentOn("org.apache.openejb.assembler.classic", "org.apache.openejb.config");
- // Nothing should be dependent on any one particular container implementation (except the Spring and Dynamic Assembler)
+ // Nothing should be dependent on any one particular container implementation (except the Dynamic Assembler)
// 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", springAssembler, dynamicAssembler);
+// assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.stateless", dynamicAssembler);
+// assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.stateful", dynamicAssembler);
+// assertNotDependentOn("org.apache.openejb", "org.apache.openejb.core.entity", dynamicAssembler);
}
private void assertNotDependentOn(String referringPacakge, String referredPackage, String... exemptionsArray) {
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?view=diff&rev=556783&r1=556782&r2=556783
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Mon Jul 16 18:04:00 2007
@@ -612,233 +612,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.0</version>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- </exclusion>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-attributes</groupId>
- <artifactId>commons-attributes-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-attributes</groupId>
- <artifactId>commons-attributes-compiler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.bea.wlplatform</groupId>
- <artifactId>commonj-twm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.experlog</groupId>
- <artifactId>xapool</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.ibatis</groupId>
- <artifactId>ibatis2-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.ibatis</groupId>
- <artifactId>ibatis2-sqlmap</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.jamonapi</groupId>
- <artifactId>jamon</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.oracle.toplink</groupId>
- <artifactId>toplink</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.oracle</groupId>
- <artifactId>toplink-essentials</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.oracle</groupId>
- <artifactId>oc4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cos</groupId>
- <artifactId>cos</artifactId>
- </exclusion>
- <exclusion>
- <groupId>freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>groovy</groupId>
- <artifactId>groovy-1.0-jsr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hessian</groupId>
- <artifactId>hessian</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jasperreports</groupId>
- <artifactId>jasperreports</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.resource</groupId>
- <artifactId>connector</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jotm</groupId>
- <artifactId>jotm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jruby</groupId>
- <artifactId>jruby</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity-tools</groupId>
- <artifactId>velocity-tools-generic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity-tools</groupId>
- <artifactId>velocity-tools-view</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-stream</artifactId>
<version>1.0.1</version>