You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2011/03/19 21:30:26 UTC
svn commit: r1083280 [1/2] - in /openejb/branches/openejb-3.2.x: ./
container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/config/
container/openejb-core/src/main/java/org/apache/openejb/persistence/
container/openejb-javaagent...
Author: tveronezi
Date: Sat Mar 19 20:30:23 2011
New Revision: 1083280
URL: http://svn.apache.org/viewvc?rev=1083280&view=rev
Log:
This is a continuation of the work started here (http://svn.apache.org/viewvc?view=revision&revision=1081644). Now I’m able to execute an application with JPA2 (with hibernate), but the unit tests are broken. I’m committing this code for safety: svn backup. I’ll continue the changes and fix these issues on another commit.
Changes:
• added the same change implemented on trunk (http://svn.apache.org/viewvc?view=revision&revision=1082629)
• openejb-axis2 code changed to be able to use maven3
• source target changed to 1.6
• ejb31-api-experimental removed
broken junit classes:
• org.apache.openejb.iTest: java.lang.IllegalStateException: Cannot find client/tools/DatabaseHome: javax.naming.NameNotFoundException Name "client/tools/DatabaseHome" not found.
• org.apache.openejb.core.stateful.EntityManagerPropogationTest: org.apache.openjpa.persistence.ArgumentException: This configuration disallows runtime optimization, but the following listed types were not enhanced at build time or at class load time with a javaagent
• org.apache.openejb.core.mdb.AmqXmlTest: java.net.ConnectException: Connection refused: connect
• org.apache.openejb.core.cmp.jpa.UnenhancedTest: org.apache.openjpa.persistence.ArgumentException: This configuration disallows runtime optimization, but the following listed types were not enhanced at build time or at class load time with a javaagent
• org.apache.openejb.ApplicationTest: java.lang.IllegalStateException: Cannot find client/tools/DatabaseHome: javax.naming.NameNotFoundException Name "client/tools/DatabaseHome" not found.
Modified:
openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml
openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
openejb/branches/openejb-3.2.x/container/openejb-javaagent/pom.xml
openejb/branches/openejb-3.2.x/container/openejb-osgi/src/main/filtered-resources/features.xml
openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml
openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml
openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml
openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml
openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml
openejb/branches/openejb-3.2.x/examples/ear-testing/pom.xml
openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml
openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml
openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml
openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml
openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml
openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml
openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml
openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml
openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml
openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml
openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml
openejb/branches/openejb-3.2.x/examples/quartz-app/pom.xml
openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml
openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml
openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml
openejb/branches/openejb-3.2.x/examples/simple-singleton/build.xml
openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml
openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml
openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml
openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml
openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml
openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml
openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml
openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml
openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml
openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml
openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml
openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml
openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml
openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml
openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml
openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml
openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml
openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml
openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml
openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml
openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml
openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml
openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml
openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml
openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml
openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml
openejb/branches/openejb-3.2.x/pom.xml
openejb/branches/openejb-3.2.x/server/openejb-axis2/pom.xml
openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java
openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java
openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java
openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java
openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java
openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml
Modified: openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-core/pom.xml Sat Mar 19 20:30:23 2011
@@ -42,6 +42,7 @@
org.quartz.*;resolution:=optional,
javax.enterprise.deploy*;resolution:=optional,
javax.jms*;resolution:=optional,
+ javax.mail*;resolution:=optional,
javax.xml.registry*;resolution:=optional,
javax.xml.rpc*;resolution:=optional,
org.apache.activemq*;resolution:=optional,
@@ -49,6 +50,7 @@
org.apache.commons.dbcp*;resolution:=optional,
org.apache.xerces*;resolution:=optional,
org.apache.xml.resolver*;resolution:=optional,
+ org.junit*;resolution:=optional,
javax.annotation*;version=1.1,
javax.transaction*;version=1.1,
javax.ejb*;version=3.1,
@@ -74,25 +76,6 @@
</testResource>
</testResources>
<plugins>
-<!--
- <plugin>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-jaxb-maven-plugin</artifactId>
- <version>0.7-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <classes>
- <class>org.apache.openejb.config.sys</class>
- </classes>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -101,14 +84,17 @@
<id>copy</id>
<phase>process-resources</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>copy</goal>
</goals>
<configuration>
- <includeGroupIds>org.apache.openejb</includeGroupIds>
- <includeArtifactIds>openejb-javaagent</includeArtifactIds>
- <includeTypes>jar</includeTypes>
- <excludeTransitive>true</excludeTransitive>
- <outputDirectory>${project.build.directory}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
@@ -118,6 +104,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
+ <testNGArtifactName>none:none</testNGArtifactName>
<argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -enableassertions</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
<systemProperties>
@@ -132,8 +119,27 @@
</systemProperties>
<excludes>
<exclude>**/TestHandler.java</exclude>
+ <exclude>org/apache/openejb/cdi/**</exclude>
</excludes>
</configuration>
+ <executions>
+ <execution>
+ <id>test-testng</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <junitArtifactName>none:none</junitArtifactName>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ <includes>
+ <include>org/apache/openejb/cdi/**</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -174,9 +180,11 @@
</manifest>
<manifestEntries>
<Class-Path>openejb-loader-${project.version}.jar openejb-client-${project.version}.jar
- xbean-finder-shaded-${xbeanVersion}.jar xbean-asm-shaded-${xbeanVersion}.jar</Class-Path>
+ xbean-finder-shaded-${xbeanVersion}.jar xbean-asm-shaded-${xbeanVersion}.jar
+ </Class-Path>
<J2EE-DeploymentFactory-Implementation-Class>
- org.apache.openejb.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class>
+ org.apache.openejb.config.VmDeploymentFactory
+ </J2EE-DeploymentFactory-Implementation-Class>
</manifestEntries>
</archive>
</configuration>
@@ -199,6 +207,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
+ <version>6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -234,14 +243,12 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${project.version}</version>
- <type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-interceptor-beans</artifactId>
<version>${project.version}</version>
- <type>ejb</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -254,13 +261,7 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>2.1</version>
- </dependency>
--->
+
<!-- ActiveMQ -->
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -271,31 +272,16 @@
<artifactId>activemq-core</artifactId>
<exclusions>
<exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
+ <artifactId>jasypt</artifactId>
+ <groupId>org.jasypt</groupId>
</exclusion>
<exclusion>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- <scope>test</scope>
- </dependency>
- <!-- End ActiveMQ -->
- <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
@@ -334,6 +320,10 @@
<artifactId>xbean-naming</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
@@ -343,11 +333,6 @@
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>commons-dbcp-all</artifactId>
</dependency>
@@ -355,18 +340,13 @@
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-stream</artifactId>
</dependency>
- <!-- added temporarily till we get a fixed version of the dep report plugin -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
<!-- webservices -->
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
<dependency>
@@ -375,16 +355,168 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.5</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
+ <groupId>org.codehaus.swizzle</groupId>
+ <artifactId>swizzle-confluence</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ejb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee</artifactId>
+ </dependency>
+ <dependency>
+ <artifactId>openwebbeans-ee-common</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject-tck</artifactId>
+ <version>1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>1.1.0-CR5</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-api</artifactId>
+ <version>1.1.0-CR5</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>1.0.2.CR1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>1.0.2.CR1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<profiles>
<profile>
@@ -413,6 +545,213 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>tck</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-tck</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>1.0.2.CR1</version>
+ <type>xml</type>
+ <classifier>suite</classifier>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <!-- OWB Implementation Package -->
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.0-SNAPSHOT</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- OWB JSF 1.2 Plugin Package -->
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf12</artifactId>
+ <overWrite>true</overWrite>
+ <version>${org.apache.openwebbeans.version}</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- OWB EL 1.0 Plugin Package -->
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el10</artifactId>
+ <overWrite>true</overWrite>
+ <version>${org.apache.openwebbeans.version}</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- OWB Web Plugin Package -->
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <overWrite>true</overWrite>
+ <version>${org.apache.openwebbeans.version}</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- JavaEE API -->
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- OWB EE Common Package -->
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ee-common</artifactId>
+ <overWrite>true</overWrite>
+ <version>${org.apache.openwebbeans.version}</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- MyFaces API Package -->
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.2.8</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- MyFaces Impl Package -->
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.2.8</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- OWB Resource Plugin Package -->
+ <artifactItem>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ <overWrite>true</overWrite>
+ <version>${org.apache.openwebbeans.version}</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- Dom4j -->
+ <artifactItem>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.6.1</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- javassist -->
+ <artifactItem>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <overWrite>true</overWrite>
+ <version>3.12.0.GA</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- scannotation -->
+ <artifactItem>
+ <groupId>net.sf.scannotation</groupId>
+ <artifactId>scannotation</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.0.2</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- commons-logging -->
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.1.1</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- commons-digester -->
+ <artifactItem>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.6</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- commons-codec -->
+ <artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.4</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- commons-validator -->
+ <artifactItem>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.3.1</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- commons-collections -->
+ <artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <overWrite>true</overWrite>
+ <version>3.2.1</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- commons-beanutils -->
+ <artifactItem>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.7.0</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- commons-discovery -->
+ <artifactItem>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <overWrite>true</overWrite>
+ <version>0.4</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <!-- xml-apis -->
+ <artifactItem>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <overWrite>true</overWrite>
+ <version>1.3.04</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testNGArtifactName>org.testng:testng</testNGArtifactName>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/cdi-suite.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>org.jboss.testharness.libraryDirectory</name>
+ <value>target/dependency/lib</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Sat Mar 19 20:30:23 2011
@@ -98,7 +98,7 @@ public class ReadDescriptors implements
if (file.getName().endsWith("persistence.xml")) {
file = file.getParentFile().getParentFile();
}
- String moduleName = file.getAbsolutePath();
+ String moduleName = file.toURI().toString();
try {
Persistence persistence = JaxbPersistenceFactory.getPersistence(persistenceUrl);
Modified: openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java Sat Mar 19 20:30:23 2011
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.IllegalClassFormatException;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URL;
import java.security.ProtectionDomain;
import java.util.ArrayList;
@@ -204,7 +205,13 @@ public class PersistenceUnitInfoImpl imp
}
public void setRootUrlAndJarUrls(String persistenceUnitRootUrl, List<String> jarFiles) throws MalformedURLException {
- File root = new File(persistenceUnitRootUrl);
+ File root;
+ try{
+ final URI rootUri = URI.create(persistenceUnitRootUrl);
+ root = new File(rootUri);
+ } catch (IllegalArgumentException e) {
+ root = new File(persistenceUnitRootUrl);
+ }
this.persistenceUnitRootUrl = toUrl(root);
try {
Modified: openejb/branches/openejb-3.2.x/container/openejb-javaagent/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-javaagent/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-javaagent/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-javaagent/pom.xml Sat Mar 19 20:30:23 2011
@@ -44,8 +44,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/container/openejb-osgi/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-osgi/src/main/filtered-resources/features.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-osgi/src/main/filtered-resources/features.xml (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-osgi/src/main/filtered-resources/features.xml Sat Mar 19 20:30:23 2011
@@ -59,13 +59,8 @@
<feature version="5.0-2">javaee-api</feature>
<bundle>mvn:org.apache.openejb/openejb-jee/${version}</bundle>
</feature>
- <feature name="ejb31-api-experimental" version="${version}">
- <feature version="5.0-2">javaee-api</feature>
- <bundle>mvn:org.apache.openejb/ejb31-api-experimental/${version}</bundle>
- </feature>
<feature name="openejb-core" version="${version}">
<feature version="5.0-2">javaee-api</feature>
- <feature version="${version}">ejb31-api-experimental</feature>
<feature version="${version}">openejb-api</feature>
<feature version="${version}">openejb-javaagent</feature>
<feature version="${version}">openejb-jee</feature>
Modified: openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/alternate-descriptors/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/application-composer/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/applicationexception/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/component-interfaces/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/custom-injection/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/ear-testing/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/ear-testing/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/ear-testing/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/ear-testing/pom.xml Sat Mar 19 20:30:23 2011
@@ -43,8 +43,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/helloworld-weblogic/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-connectionfactory/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-datasource/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-ejbs/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-entitymanager/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/injection-of-env-entry/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/interceptors/pom.xml Sat Mar 19 20:30:23 2011
@@ -40,8 +40,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/jpa-eclipselink/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/jpa-hibernate/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs-with-descriptor/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/lookup-of-ejbs/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/quartz-app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/quartz-app/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/quartz-app/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/quartz-app/pom.xml Sat Mar 19 20:30:23 2011
@@ -63,8 +63,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-cmp2/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-mdb-with-descriptor/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-mdb/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/simple-singleton/build.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-singleton/build.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-singleton/build.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-singleton/build.xml Sat Mar 19 20:30:23 2011
@@ -45,7 +45,6 @@
<!-- Build Classpath -->
<artifact:dependencies pathId="classpath.main">
<dependency groupId="org.apache.openejb" artifactId="javaee-api" version="6.0-SNAPSHOT"/>
- <dependency groupId="org.apache.openejb" artifactId="ejb31-api-experimental" version="3.1.5-SNAPSHOT"/>
</artifact:dependencies>
<!-- Test Build Classpath -->
Modified: openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-singleton/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
@@ -59,12 +59,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>ejb31-api-experimental</artifactId>
- <version>3.1.5-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.1</version>
Modified: openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-stateful/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-stateless-with-descriptor/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-stateless/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/simple-webservice/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/spring-integration/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/telephone-stateful/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/testcase-injection/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/testing-security-2/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/testing-security/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/testing-transactions/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/transaction-rollback/pom.xml Sat Mar 19 20:30:23 2011
@@ -39,8 +39,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/troubleshooting/pom.xml Sat Mar 19 20:30:23 2011
@@ -39,8 +39,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/applet/pom.xml Sat Mar 19 20:30:23 2011
@@ -56,8 +56,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/ejb-examples/pom.xml Sat Mar 19 20:30:23 2011
@@ -57,8 +57,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/ejb-webservice/pom.xml Sat Mar 19 20:30:23 2011
@@ -58,8 +58,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/jsf/pom.xml Sat Mar 19 20:30:23 2011
@@ -37,8 +37,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/moviefun/pom.xml Sat Mar 19 20:30:23 2011
@@ -64,8 +64,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webapps/struts/pom.xml Sat Mar 19 20:30:23 2011
@@ -81,8 +81,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webservice-attachments/pom.xml Sat Mar 19 20:30:23 2011
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webservice-inheritance/pom.xml Sat Mar 19 20:30:23 2011
@@ -32,8 +32,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webservice-security/pom.xml Sat Mar 19 20:30:23 2011
@@ -78,8 +78,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
Modified: openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/examples/webservice-ws-security/pom.xml Sat Mar 19 20:30:23 2011
@@ -95,8 +95,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/itests/openejb-itests-app/pom.xml Sat Mar 19 20:30:23 2011
@@ -77,11 +77,6 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>ejb31-api-experimental</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${project.version}</version>
<type>ejb</type>
Modified: openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/itests/openejb-itests-beans/pom.xml Sat Mar 19 20:30:23 2011
@@ -34,11 +34,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>ejb31-api-experimental</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
Modified: openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml (original)
+++ openejb/branches/openejb-3.2.x/itests/openejb-itests-client/pom.xml Sat Mar 19 20:30:23 2011
@@ -89,11 +89,6 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>ejb31-api-experimental</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
<version>${pom.version}</version>
<type>ejb</type>