You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/25 08:31:05 UTC
svn commit: r1175303 - in /openejb/trunk/openejb3:
assembly/openejb-tomcat/openejb-tomcat-webapp/
assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/
container/openejb-core/src/main/resources/
container/openejb-core/src/test/java/org/apach...
Author: dblevins
Date: Sun Sep 25 06:31:04 2011
New Revision: 1175303
URL: http://svn.apache.org/viewvc?rev=1175303&view=rev
Log:
quick attempt to trim the distro for at least one tck run. not quite functional "plus" profile for the full thing
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/plus.xml
- copied, changed from r1175289, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1175303&r1=1175302&r2=1175303&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Sun Sep 25 06:31:04 2011
@@ -96,18 +96,34 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.patch</groupId>
+ <artifactId>openejb-jstl</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
<classifier>tomcat</classifier>
<version>${javaee-api.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.swizzle</groupId>
- <artifactId>swizzle-stream</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jsf</artifactId>
+ <artifactId>openejb-client</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -119,7 +135,7 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>tomee-webservices</artifactId>
+ <artifactId>openejb-core</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -127,51 +143,27 @@
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-tomcat-loader</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- <exclusions>
<exclusion>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
</exclusion>
- <exclusion> <!-- 'provided' -->
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-tomcat-catalina</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- <exclusions>
<exclusion>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-webservices</artifactId>
- <version>${project.version}</version>
- <exclusions>
<exclusion>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
</exclusion>
</exclusions>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-rest</artifactId>
+ <artifactId>openejb-ejbd</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -183,7 +175,7 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-cxf-transport</artifactId>
+ <artifactId>openejb-hsql</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -195,7 +187,7 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-cxf</artifactId>
+ <artifactId>openejb-http</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -207,9 +199,9 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-cxf-rs</artifactId>
+ <artifactId>openejb-itests-beans</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
@@ -218,15 +210,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <artifactId>openejb-itests-client</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
@@ -236,7 +223,7 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-tomcat-common</artifactId>
+ <artifactId>openejb-jsf</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -244,10 +231,6 @@
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
- <exclusion> <!-- 'provided' -->
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -264,7 +247,7 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-ejbd</artifactId>
+ <artifactId>openejb-tomcat-catalina</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -272,23 +255,15 @@
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-hsql</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- <exclusions>
<exclusion>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-derbynet</artifactId>
+ <artifactId>openejb-tomcat-common</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
@@ -296,68 +271,31 @@
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-http</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- <exclusions>
<exclusion>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-client</artifactId>
+ <artifactId>openejb-tomcat-loader</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
+ <exclusion> <!-- 'provided' -->
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.patch</groupId>
- <artifactId>openejb-jstl</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.6.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>10.6.1.0</version>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-stream</artifactId>
</dependency>
</dependencies>
<profiles>
@@ -447,6 +385,50 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>plus</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/plus.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-cxf-rs</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
+ <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-cxf-transport</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
+ <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-cxf</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
+ <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-rest</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
+ <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-webservices</artifactId><version>${project.version}</version><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions><scope>runtime</scope></dependency>
+ <dependency><groupId>org.apache.openejb</groupId><artifactId>tomee-webservices</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Copied: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/plus.xml (from r1175289, openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/plus.xml?p2=openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/plus.xml&p1=openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml&r1=1175289&r2=1175303&rev=1175303&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/plus.xml Sun Sep 25 06:31:04 2011
@@ -20,7 +20,7 @@
<!-- $Rev: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
<assembly>
- <id>war</id>
+ <id>plus</id>
<formats>
<format>war</format>
</formats>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml?rev=1175303&r1=1175302&r2=1175303&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/war.xml Sun Sep 25 06:31:04 2011
@@ -71,7 +71,20 @@
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
- <exclude>org.apache.tomcat:tomcat-catalina</exclude>
+ <!--<exclude>org.apache.tomcat:tomcat-catalina</exclude>-->
+ <!--<exclude>org.apache.openejb:tomee-webservices</exclude>-->
+ <!--<exclude>org.apache.openejb:openejb-webservices</exclude>-->
+ <!--<exclude>wsdl4j:wsdl4j</exclude>-->
+ <!--<exclude>org.apache.openejb:openejb-rest</exclude>-->
+ <!--<exclude>org.apache.openejb:openejb-cxf-transport</exclude>-->
+ <!--<exclude>org.apache.cxf:cxf-bundle</exclude>-->
+ <!--<exclude>org.apache.ws.xmlschema:xmlschema-core</exclude>-->
+ <!--<exclude>org.apache.openejb:openejb-cxf</exclude>-->
+ <!--<exclude>org.apache.ws.security:wss4j</exclude>-->
+ <!--<exclude>org.opensaml:openws</exclude>-->
+ <!--<exclude>org.apache.openejb:openejb-cxf-rs</exclude>-->
+ <!--<exclude>org.apache.activemq:activemq-core</exclude>-->
+ <!--<exclude>org.apache.activemq:activemq-ra</exclude>-->
<!--<exclude>org.apache.openejb:javaee-api</exclude>-->
</excludes>
</dependencySet>
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf?rev=1175303&r1=1175302&r2=1175303&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf Sun Sep 25 06:31:04 2011
@@ -2,6 +2,22 @@
<openejb>
+<Container id="My Singleton Container" type="SINGLETON">
+ # Specifies the maximum time an invocation could wait for the
+ # singleton bean instance to become available before giving up.
+ #
+ # After the timeout is reached a javax.ejb.ConcurrentAccessTimeoutException
+ # will be thrown.
+ #
+ # Usable time units: nanoseconds, microsecons, milliseconds,
+ # seconds, minutes, hours, days. Or any combination such as
+ # "1 hour and 27 minutes and 10 seconds"
+
+ AccessTimeout = 30 seconds
+
+</Container>
+
+
<Container id="My Stateful Container" type="STATEFUL">
# Specifies the maximum time an invocation could wait for the
# stateful bean instance to become available before giving up.
@@ -136,28 +152,6 @@
</Container>
-<Container id="My MDB Container" type="MESSAGE">
-
- # The resource adapter delivers messages to the container
-
- ResourceAdapter My JMS Resource Adapter
-
- # Specifies the message listener interface handled by this container
-
- MessageListenerInterface javax.jms.MessageListener
-
- # Specifies the activation spec class
-
- ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec
-
- # Specifies the maximum number of bean instances that are
- # allowed to exist for each MDB deployment.
-
- InstanceLimit 10
-
-</Container>
-
-
<!--
# For more examples of database configuration see:
# http://openejb.apache.org/3.0/databases.html
@@ -181,49 +175,6 @@
</Resource>
-<Resource id="My JMS Resource Adapter" type="ActiveMQResourceAdapter">
- # Broker configuration URI as defined by ActiveMQ
- # see http://activemq.apache.org/broker-configuration-uri.html
-
- BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
-
- # Broker address
-
- ServerUrl vm://localhost?async=true
-
- # DataSource for persistence messages
-
- DataSource My Unmanaged DataSource
-</Resource>
-
-
-<Connector id="My JMS Connection Factory" type="javax.jms.ConnectionFactory">
-
- ResourceAdapter My JMS Resource Adapter
-
- # Specifies if the connection is enrolled in global transaction
- # allowed values: xa, local or none
-
- TransactionSupport xa
-
- # Maximum number of physical connection to the ActiveMQ broker
-
- PoolMaxSize 10
-
- # Minimum number of physical connection to the ActiveMQ broker
-
- PoolMinSize 0
-
- # Maximum amount of time to wait for a connection
-
- ConnectionMaxWaitMilliseconds 5000
-
- # Maximum amount of time a connection can be idle before being reclaimed
-
- ConnectionMaxIdleMinutes 15
-
-</Connector>
-
<!--
#
# The <Deployments> element can be used to configure file
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java?rev=1175303&r1=1175302&r2=1175303&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java Sun Sep 25 06:31:04 2011
@@ -74,8 +74,8 @@ public class DataSourceDefinitionTest {
})
@Stateless
public static class DatasourceDefinitionsBean {
- @Resource(lookup = "java:comp/env/superMegaDS") private DataSource mega;
- @Resource(lookup = "java:comp/env/superGigaDS") private DataSource giga;
+ @Resource(name = "java:comp/env/superMegaDS") private DataSource mega;
+ @Resource(name = "java:comp/env/superGigaDS") private DataSource giga;
public DataSource getMega() {
return mega;