You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2007/04/26 23:14:14 UTC
svn commit: r532866 - in /incubator/openejb/trunk/openejb3: ./
container/openejb-core/
container/openejb-core/src/test/java/org/apache/openejb/config/
container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/
container/openejb-javaagent/ co...
Author: jlaskowski
Date: Thu Apr 26 14:14:11 2007
New Revision: 532866
URL: http://svn.apache.org/viewvc?view=rev&rev=532866
Log:
Dependency version management
$Rev$ $Date$ additions
org.apache.maven.plugins.maven-dependency-plugin
xerces.xerces -> xerces.xercesImpl
xerces upgrade to 2.6.2
<maven.test.skip>true</maven.test.skip> -> <skip>true</skip> in org.apache.maven.plugins.maven-surefire-plugin
Move activemq-data directory to target (it means the current working dir had to be moved for surefire)
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
incubator/openejb/trunk/openejb3/container/openejb-javaagent/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-invalid.xml
incubator/openejb/trunk/openejb3/examples/calculator-stateless-pojo/pom.xml
incubator/openejb/trunk/openejb3/examples/counter-stateful-pojo/pom.xml
incubator/openejb/trunk/openejb3/examples/ejb-injection/pom.xml
incubator/openejb/trunk/openejb3/examples/helloworld-stateful-pojo/pom.xml
incubator/openejb/trunk/openejb3/examples/resource-injection/pom.xml
incubator/openejb/trunk/openejb3/examples/telephone-stateful/pom.xml
incubator/openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestJms.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java
incubator/openejb/trunk/openejb3/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-admin/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-axis/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-client/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-corba/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-telnet/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-xfire/pom.xml
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Thu Apr 26 14:14:11 2007
@@ -40,16 +40,11 @@
</resources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
-
- <!-- TODO switch to maven version of plugin when it is released -->
- <!--groupId>org.apache.maven.plugins</groupId-->
- <!--artifactId>maven-dependency-plugin</artifactId-->
-
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-dependencies</id>
+ <id>copy</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
@@ -75,6 +70,7 @@
<!-- DEBUG: Uncomment this line and comment out the next -->
<!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${basedir}/target/openejb-javaagent-${version}.jar</argLine>-->
<argLine>-javaagent:${basedir}/target/openejb-javaagent-${version}.jar -enableassertions</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
<systemProperties>
<property>
<name>openejb.home</name>
@@ -152,6 +148,24 @@
<artifactId>openejb-jee</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-app</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-beans</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-client</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- ActiveMQ -->
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -169,7 +183,7 @@
<!-- these are for castor, should be added to its pom.xml -->
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
+ <artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -180,12 +194,10 @@
<artifactId>oro</artifactId>
</dependency>
<!-- end castor deps -->
-
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
@@ -234,7 +246,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
-
<!-- JavaMail -->
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
@@ -245,7 +256,6 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
<!-- End: JavaMail -->
-
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
@@ -298,48 +308,26 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-app</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
- <!-- used by dbcp and openjp -->
+ <!-- used by dbcp and openjpa -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-stream</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws-api</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JaxbUnmarshallerTest.java Thu Apr 26 14:14:11 2007
@@ -30,7 +30,7 @@
public final void testUnmarshalURL() {
try {
- final URL applicationXmlUrl = new File("target/test-classes/META-INF/application.xml").toURL();
+ final URL applicationXmlUrl = getClass().getClassLoader().getResource("META-INF/application.xml");
JaxbUnmarshaller unmarshaller = new JaxbUnmarshaller(Application.class, "META-INF/application.xml");
unmarshaller.unmarshal(applicationXmlUrl);
} catch (Exception e) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-openejb-jar.xml Thu Apr 26 14:14:11 2007
@@ -1,4 +1,25 @@
<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<!-- $Rev: 532172 $ $Date: 2007-04-25 04:27:22 +0200 (Wed, 25 Apr 2007) $ -->
+
<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
@@ -28,7 +49,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
</dependency>
</dependencies>
</environment>
Modified: incubator/openejb/trunk/openejb3/container/openejb-javaagent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-javaagent/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-javaagent/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-javaagent/pom.xml Thu Apr 26 14:14:11 2007
@@ -25,9 +25,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-javaagent</artifactId>
<name>OpenEJB :: Container :: Java Agent</name>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
<build>
<plugins>
<plugin>
@@ -48,6 +45,13 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
</configuration>
</plugin>
</plugins>
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml Thu Apr 26 14:14:11 2007
@@ -16,7 +16,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-invalid.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-invalid.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-invalid.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-invalid.xml Thu Apr 26 14:14:11 2007
@@ -36,7 +36,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: incubator/openejb/trunk/openejb3/examples/calculator-stateless-pojo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/examples/calculator-stateless-pojo/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/examples/calculator-stateless-pojo/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/examples/calculator-stateless-pojo/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -58,7 +61,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.1</version>
<scope>test</scope>
</dependency>
Modified: incubator/openejb/trunk/openejb3/examples/counter-stateful-pojo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/examples/counter-stateful-pojo/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/examples/counter-stateful-pojo/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/examples/counter-stateful-pojo/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -58,7 +61,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.1</version>
<scope>test</scope>
</dependency>
Modified: incubator/openejb/trunk/openejb3/examples/ejb-injection/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/examples/ejb-injection/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/examples/ejb-injection/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/examples/ejb-injection/pom.xml Thu Apr 26 14:14:11 2007
@@ -61,7 +61,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.1</version>
<scope>test</scope>
</dependency>
Modified: incubator/openejb/trunk/openejb3/examples/helloworld-stateful-pojo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/examples/helloworld-stateful-pojo/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/examples/helloworld-stateful-pojo/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/examples/helloworld-stateful-pojo/pom.xml Thu Apr 26 14:14:11 2007
@@ -68,7 +68,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.1</version>
<scope>test</scope>
</dependency>
Modified: incubator/openejb/trunk/openejb3/examples/resource-injection/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/examples/resource-injection/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/examples/resource-injection/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/examples/resource-injection/pom.xml Thu Apr 26 14:14:11 2007
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openejb</groupId>
@@ -69,28 +69,28 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.1</version>
<scope>test</scope>
</dependency>
- <!--
- Nice thing about maven2 is it has test-only dependencies.
- This guarantees that non of your runtime code is dependent
- on any OpenEJB classes.
-
- For those of you who want to know the minimum steps required
- to add OpenEJB for testing to an existing maven 2 build, you
- simply add this dependency below and in your test code create
- your InitialContext like such:
-
- Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
-
- // Tells OpenEJB to look for META-INF/ejb-jar.xml files in the classpath
- properties.setProperty("openejb.deployments.classpath", "true");
-
- initialContext = new InitialContext(properties);
-
+ <!--
+ Nice thing about maven2 is it has test-only dependencies.
+ This guarantees that non of your runtime code is dependent
+ on any OpenEJB classes.
+
+ For those of you who want to know the minimum steps required
+ to add OpenEJB for testing to an existing maven 2 build, you
+ simply add this dependency below and in your test code create
+ your InitialContext like such:
+
+ Properties properties = new Properties();
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
+
+ // Tells OpenEJB to look for META-INF/ejb-jar.xml files in the classpath
+ properties.setProperty("openejb.deployments.classpath", "true");
+
+ initialContext = new InitialContext(properties);
+
-->
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: incubator/openejb/trunk/openejb3/examples/telephone-stateful/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/examples/telephone-stateful/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/examples/telephone-stateful/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/examples/telephone-stateful/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -58,7 +61,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.1</version>
<scope>test</scope>
</dependency>
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -82,7 +85,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -59,7 +62,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/ActiveMqTestJms.java Thu Apr 26 14:14:11 2007
@@ -22,6 +22,9 @@
import javax.jms.ConnectionFactory;
import java.util.Properties;
+/**
+ * @version $Rev$ $Date$
+ */
public class ActiveMqTestJms implements TestJms {
public void init(Properties props) {
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java Thu Apr 26 14:14:11 2007
@@ -24,8 +24,9 @@
import java.util.Properties;
/**
- *
* @author <a href="mailto:david.blevins@visi.com">David Blevins</a>
+ *
+ * @version $Rev$ $Date$
*/
public class DerbyTestDatabase implements TestDatabase{
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestJms.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestJms.java?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestJms.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestJms.java Thu Apr 26 14:14:11 2007
@@ -20,6 +20,9 @@
import javax.jms.ConnectionFactory;
import java.util.Properties;
+/**
+ * @version $Rev$ $Date$
+ */
public interface TestJms {
void init(Properties props);
ConnectionFactory getConnectionFactory();
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java Thu Apr 26 14:14:11 2007
@@ -24,6 +24,8 @@
*
* @author <a href="mailto:david.blevins@visi.com">David Blevins</a>
* @author <a href="mailto:Richard@Monson-Haefel.com">Richard Monson-Haefel</a>
+ *
+ * @version $Rev$ $Date$
*/
public class StatelessJndiEncTests extends StatelessTestClient{
Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Thu Apr 26 14:14:11 2007
@@ -912,8 +912,23 @@
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws-api</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: incubator/openejb/trunk/openejb3/server/openejb-admin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-admin/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-admin/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-admin/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -36,7 +39,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/openejb/trunk/openejb3/server/openejb-axis/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-axis/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-axis/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-axis/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -52,7 +55,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/openejb/trunk/openejb3/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-client/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-client/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-client/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -44,7 +47,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- Launch a new vm for each test -->
<forkMode>pertest</forkMode>
</configuration>
</plugin>
@@ -62,7 +64,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/openejb/trunk/openejb3/server/openejb-corba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-corba/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-corba/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-corba/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -47,7 +50,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml Thu Apr 26 14:14:11 2007
@@ -60,14 +60,15 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- DEBUG: Uncomment this line and comment out the next -->
- <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${basedir}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
- <argLine>-javaagent:${basedir}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>
+ <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
+ <argLine>-javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar</argLine>
<systemProperties>
<property>
<name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
+ <value>${project.build.directory}/test-classes</value>
</property>
</systemProperties>
+ <basedir>${project.build.directory}</basedir>
</configuration>
</plugin>
</plugins>
Modified: incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -30,24 +33,16 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
-
- <!-- TODO switch to maven version of plugin when it is released -->
- <!--groupId>org.apache.maven.plugins</groupId-->
- <!--artifactId>maven-dependency-plugin</artifactId-->
-
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-dependencies</id>
+ <id>copy</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
- <!-- DEBUG: Uncomment this line and comment out the next -->
- <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${basedir}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
- <argLine>-javaagent:${basedir}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>
<artifactItems>
<artifactItem>
<groupId>org.apache.openejb</groupId>
@@ -65,14 +60,15 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- DEBUG: Uncomment this line and comment out the next -->
- <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${basedir}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
- <argLine>-javaagent:${basedir}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>
+ <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -javaagent:${project.build.directory}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
+ <argLine>-javaagent:${project.build.directory}/openejb-javaagent-${version}.jar=foo=bar</argLine>
<systemProperties>
<property>
<name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
+ <value>${project.build.directory}/test-classes</value>
</property>
</systemProperties>
+ <basedir>${project.build.directory}</basedir>
</configuration>
</plugin>
</plugins>
Modified: incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml Thu Apr 26 14:14:11 2007
@@ -49,7 +49,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/openejb/trunk/openejb3/server/openejb-telnet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-telnet/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-telnet/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-telnet/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -41,7 +44,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/openejb/trunk/openejb3/server/openejb-xfire/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-xfire/pom.xml?view=diff&rev=532866&r1=532865&r2=532866
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-xfire/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-xfire/pom.xml Thu Apr 26 14:14:11 2007
@@ -16,6 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -41,7 +44,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>