You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/05/14 20:53:33 UTC
svn commit: r944388 [1/5] - in
/geronimo/external/branches/openejb-3.1.3-r942249: ./ api/
api/ejb31-api-experimental/ container/ container/openejb-activemq4/
container/openejb-api/ container/openejb-core/ container/openejb-javaagent/
container/openejb-...
Author: rickmcguire
Date: Fri May 14 18:53:32 2010
New Revision: 944388
URL: http://svn.apache.org/viewvc?rev=944388&view=rev
Log:
[maven-release-plugin] prepare release openejb-3.1.3.0
Modified:
geronimo/external/branches/openejb-3.1.3-r942249/api/ejb31-api-experimental/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/api/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-api/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-javaagent/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-jee/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-loader/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/deps/javaee-api/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/deps/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/itests/openejb-itests-app/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/itests/openejb-itests-beans/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/itests/openejb-itests-client/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/itests/openejb-itests-interceptor-beans/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/itests/openejb-itests-servlets/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/itests/openejb-itests-web/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/itests/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-activemq/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-admin/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-axis/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-axis2/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-client/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-corba/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-cxf/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-derbynet/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-ejbd/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-hsql/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-http/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-multicast/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-server/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-telnet/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-webadmin/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/openejb-webservices/pom.xml
geronimo/external/branches/openejb-3.1.3-r942249/server/pom.xml
Modified: geronimo/external/branches/openejb-3.1.3-r942249/api/ejb31-api-experimental/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/api/ejb31-api-experimental/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/api/ejb31-api-experimental/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/api/ejb31-api-experimental/pom.xml Fri May 14 18:53:32 2010
@@ -1,39 +1,20 @@
-<?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
-
- 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.
--->
-<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>
- <artifactId>api</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>ejb31-api-experimental</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: APIs :: EJB 3.1 Experimental</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>5.0.3-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
-
+<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>
+ <artifactId>api</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>ejb31-api-experimental</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: APIs :: EJB 3.1 Experimental</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>5.0.3</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/api/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/api/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/api/pom.xml Fri May 14 18:53:32 2010
@@ -1,34 +1,15 @@
-<?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
-
- 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.
--->
-<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>
- <artifactId>openejb</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>api</artifactId>
- <packaging>pom</packaging>
- <name>OpenEJB :: APIs</name>
-
- <modules>
- <module>ejb31-api-experimental</module>
- </modules>
-</project>
-
+<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>
+ <artifactId>openejb</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>api</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenEJB :: APIs</name>
+
+ <modules>
+ <module>ejb31-api-experimental</module>
+ </modules>
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/pom.xml Fri May 14 18:53:32 2010
@@ -1,231 +1,207 @@
-<?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
-
- 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: 895326 $ $Date: 2010-01-03 03:39:14 +0100 (So, 03 Jan 2010) $ -->
-
-<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>
- <artifactId>container</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-activemq4</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: ActiveMQ4</name>
- <properties>
- <openejb.osgi.import.pkg>
- org.apache.activemq.ra;resolution:=optional
- </openejb.osgi.import.pkg>
- <openejb.osgi.export/>
- </properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/TestHandler.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <tstamp>
- <format property="TSTAMP" pattern="hh:mm"/>
- </tstamp>
- <replace file="target/classes/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}"/>
- <replace file="target/classes/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}"/>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <java classname="org.apache.openejb.util.MakeTxLookup">
- <arg value="${project.build.directory}"/>
- <classpath>
- <pathelement path="${compile_classpath}"/>
- </classpath>
- </java>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass/>
- <!--<addClasspath>true</addClasspath>-->
- </manifest>
- <manifestEntries/>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes/>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${version}</version>
- <exclusions>
- <!-- Ignore ActiveMQ 5.x-->
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- ActiveMQ -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>4.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
- </dependency>
- <!-- End ActiveMQ -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>3.4.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>openejb.debug</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE
- -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
- </argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
-
+<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>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-activemq4</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: ActiveMQ4</name>
+ <properties>
+ <openejb.osgi.import.pkg>
+ org.apache.activemq.ra;resolution:=optional
+ </openejb.osgi.import.pkg>
+ <openejb.osgi.export />
+ </properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>**/TestHandler.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <tstamp>
+ <format property="TSTAMP" pattern="hh:mm" />
+ </tstamp>
+ <replace file="target/classes/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
+ <replace file="target/classes/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
+ <property name="compile_classpath" refid="maven.compile.classpath" />
+ <java classname="org.apache.openejb.util.MakeTxLookup">
+ <arg value="${project.build.directory}" />
+ <classpath>
+ <pathelement path="${compile_classpath}" />
+ </classpath>
+ </java>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass />
+ <!--<addClasspath>true</addClasspath>-->
+ </manifest>
+ <manifestEntries />
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes />
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${version}</version>
+ <exclusions>
+ <!-- Ignore ActiveMQ 5.x-->
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- ActiveMQ -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+ <!-- End ActiveMQ -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.5.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>3.4.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>openejb.debug</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE
+ -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
+ </argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-api/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-api/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-api/pom.xml Fri May 14 18:53:32 2010
@@ -1,34 +1,12 @@
-<!--
-
- 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: 714127 $ $Date: 2008-11-14 12:27:54 -0800 (Fri, 14 Nov 2008) $ -->
-
-<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>
- <artifactId>container</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-api</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: API</name>
-
-</project>
-
+<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>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-api</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: API</name>
+
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/pom.xml Fri May 14 18:53:32 2010
@@ -1,394 +1,370 @@
-<?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
-
- 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"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>container</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-core</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: Core</name>
- <properties>
- <openejb.osgi.import.pkg>
- org.apache.activemq.ra;resolution:=optional,
- org.apache.commons.dbcp.managed;resolution:=optional,
- oracle.toplink.*;resolution:=optional,
- org.apache.openjpa.*;resolution:=optional,
- org.eclipse.persistence.*;resolution:=optional,
- org.hibernate.*;resolution:=optional,
- org.quartz.*;resolution:=optional,
- javax.enterprise.deploy*;resolution:=optional,
- javax.jms*;resolution:=optional,
- javax.xml.registry*;resolution:=optional,
- javax.xml.rpc*;resolution:=optional,
- org.apache.activemq*;resolution:=optional,
- org.apache.catalina*;resolution:=optional,
- org.apache.commons.dbcp*;resolution:=optional,
- org.apache.xerces*;resolution:=optional,
- org.apache.xml.resolver*;resolution:=optional,
- javax.annotation*;version=1.1,
- javax.transaction*;version=1.1,
- javax.ejb*;version=3.1,
- javax.xml.ws,
- *
- </openejb.osgi.import.pkg>
- <openejb.osgi.export>
- !org.apache.openejb.client,
- org.apache.openejb*;version=${openejb.osgi.export.version}
- </openejb.osgi.export>
- </properties>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </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>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/TestHandler.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <tstamp>
- <format property="TSTAMP" pattern="hh:mm" />
- </tstamp>
- <replace file="target/classes/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
- <replace file="target/classes/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
- <property name="compile_classpath" refid="maven.compile.classpath" />
- <java classname="org.apache.openejb.util.MakeTxLookup">
- <arg value="${project.build.directory}" />
- <classpath>
- <pathelement path="${compile_classpath}" />
- </classpath>
- </java>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.openejb.cli.Bootstrap</mainClass>
- <!--<addClasspath>true</addClasspath>-->
- </manifest>
- <manifestEntries>
- <Class-Path>openejb-loader-${version}.jar openejb-client-${version}.jar
- 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>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.examples</exclude>
- <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.help</exclude>
- <exclude>src/main/resources/META-INF/org.apache.openejb.resource.jdbc.DataSourcePlugin/*</exclude>
- <exclude>src/main/resources/schema/ejb-jar_1_1.xsd</exclude>
- <exclude>src/main/resources/META-INF/services/org/apache/activemq/broker/openejb</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>5.0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>ejb31-api-experimental</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-loader</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-jee</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-itests-app</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-itests-interceptor-beans</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <!-- ActiveMQ -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </dependency>
- <!-- End ActiveMQ -->
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- </dependency>
- <dependency>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
- </dependency>
- <!-- JavaMail -->
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- </dependency>
- <!-- End: JavaMail -->
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-naming</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <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>
- <dependency>
- <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>
- <artifactId>quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>openejb.debug</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
-
+<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>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-core</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: Core</name>
+ <properties>
+ <openejb.osgi.import.pkg>
+ org.apache.activemq.ra;resolution:=optional,
+ org.apache.commons.dbcp.managed;resolution:=optional,
+ oracle.toplink.*;resolution:=optional,
+ org.apache.openjpa.*;resolution:=optional,
+ org.eclipse.persistence.*;resolution:=optional,
+ org.hibernate.*;resolution:=optional,
+ org.quartz.*;resolution:=optional,
+ javax.enterprise.deploy*;resolution:=optional,
+ javax.jms*;resolution:=optional,
+ javax.xml.registry*;resolution:=optional,
+ javax.xml.rpc*;resolution:=optional,
+ org.apache.activemq*;resolution:=optional,
+ org.apache.catalina*;resolution:=optional,
+ org.apache.commons.dbcp*;resolution:=optional,
+ org.apache.xerces*;resolution:=optional,
+ org.apache.xml.resolver*;resolution:=optional,
+ javax.annotation*;version=1.1,
+ javax.transaction*;version=1.1,
+ javax.ejb*;version=3.1,
+ javax.xml.ws,
+ *
+ </openejb.osgi.import.pkg>
+ <openejb.osgi.export>
+ !org.apache.openejb.client,
+ org.apache.openejb*;version=${openejb.osgi.export.version}
+ </openejb.osgi.export>
+ </properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </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>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>-Xmx256m "-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>**/TestHandler.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <tstamp>
+ <format property="TSTAMP" pattern="hh:mm" />
+ </tstamp>
+ <replace file="target/classes/openejb-version.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
+ <replace file="target/classes/openejb-version.properties" token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
+ <property name="compile_classpath" refid="maven.compile.classpath" />
+ <java classname="org.apache.openejb.util.MakeTxLookup">
+ <arg value="${project.build.directory}" />
+ <classpath>
+ <pathelement path="${compile_classpath}" />
+ </classpath>
+ </java>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.openejb.cli.Bootstrap</mainClass>
+ <!--<addClasspath>true</addClasspath>-->
+ </manifest>
+ <manifestEntries>
+ <Class-Path>openejb-loader-${version}.jar openejb-client-${version}.jar
+ 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>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.examples</exclude>
+ <exclude>src/main/resources/META-INF/org.apache.openejb.cli/validate.help</exclude>
+ <exclude>src/main/resources/META-INF/org.apache.openejb.resource.jdbc.DataSourcePlugin/*</exclude>
+ <exclude>src/main/resources/schema/ejb-jar_1_1.xsd</exclude>
+ <exclude>src/main/resources/META-INF/services/org/apache/activemq/broker/openejb</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>5.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>ejb31-api-experimental</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-itests-app</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-itests-beans</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-itests-interceptor-beans</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-itests-client</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <!-- ActiveMQ -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
+ <!-- End ActiveMQ -->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.howl</groupId>
+ <artifactId>howl</artifactId>
+ </dependency>
+ <!-- JavaMail -->
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ </dependency>
+ <!-- End: JavaMail -->
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <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>
+ <dependency>
+ <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>
+ <artifactId>quartz</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.5.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>openejb.debug</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-javaagent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-javaagent/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-javaagent/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-javaagent/pom.xml Fri May 14 18:53:32 2010
@@ -1,67 +1,48 @@
-<?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.
--->
-<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>
- <artifactId>container</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-javaagent</artifactId>
- <name>OpenEJB :: Container :: Java Agent</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Premain-Class>org.apache.openejb.javaagent.Agent</Premain-Class>
- <Agent-Class>org.apache.openejb.javaagent.Agent</Agent-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- <Can-Retransform-Classes>true</Can-Retransform-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <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>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-</project>
-
+<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>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-javaagent</artifactId>
+ <name>OpenEJB :: Container :: Java Agent</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Premain-Class>org.apache.openejb.javaagent.Agent</Premain-Class>
+ <Agent-Class>org.apache.openejb.javaagent.Agent</Agent-Class>
+ <Can-Redefine-Classes>true</Can-Redefine-Classes>
+ <Can-Retransform-Classes>true</Can-Retransform-Classes>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <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>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-jee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-jee/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-jee/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-jee/pom.xml Fri May 14 18:53:32 2010
@@ -1,128 +1,106 @@
-<?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
-
- 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>container</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-jee</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: Java EE</name>
- <build>
- <plugins>
-<!--
- <plugin>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-jaxb-maven-plugin</artifactId>
- <version>0.7.2</version>
- <executions>
- <execution>
- <configuration>
- <classes>
- <class>org.apache.openejb.jee</class>
- <class>org.apache.openejb.jee.jba</class>
- <class>org.apache.openejb.jee.jba.cmp</class>
- <class>org.apache.openejb.jee.jpa</class>
- <class>org.apache.openejb.jee.oejb2</class>
- <class>org.apache.openejb.jee.oejb3</class>
- <class>org.apache.openejb.jee.sun</class>
- <class>org.apache.openejb.jee.wls</class>
- </classes>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/schema/xml.xsd</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
-<!--
- <dependency>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-jaxb</artifactId>
- <version>0.7.2</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
--->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>5.0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>openejb.debug</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>-enableassertions -agentlib:jdwp=transport=dt_socket,server=y,address=5005</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
-
+<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>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-jee</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: Java EE</name>
+ <build>
+ <plugins>
+<!--
+ <plugin>
+ <groupId>com.envoisolutions.sxc</groupId>
+ <artifactId>sxc-jaxb-maven-plugin</artifactId>
+ <version>0.7.2</version>
+ <executions>
+ <execution>
+ <configuration>
+ <classes>
+ <class>org.apache.openejb.jee</class>
+ <class>org.apache.openejb.jee.jba</class>
+ <class>org.apache.openejb.jee.jba.cmp</class>
+ <class>org.apache.openejb.jee.jpa</class>
+ <class>org.apache.openejb.jee.oejb2</class>
+ <class>org.apache.openejb.jee.oejb3</class>
+ <class>org.apache.openejb.jee.sun</class>
+ <class>org.apache.openejb.jee.wls</class>
+ </classes>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/META-INF/schema/xml.xsd</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+<!--
+ <dependency>
+ <groupId>com.envoisolutions.sxc</groupId>
+ <artifactId>sxc-jaxb</artifactId>
+ <version>0.7.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+-->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>5.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>openejb.debug</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>-enableassertions -agentlib:jdwp=transport=dt_socket,server=y,address=5005</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-loader/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-loader/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-loader/pom.xml Fri May 14 18:53:32 2010
@@ -1,67 +1,45 @@
-<!--
-
- 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>container</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-loader</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: Loader</name>
- <properties>
- <openejb.osgi.import>
- org.apache.catalina*;resolution:=optional,
- !sun.misc.*,
- org.apache.openejb.*,
- javax.transaction*;version=1.1,
- *
- </openejb.osgi.import>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>5.0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>org.apache.openejb,javax.transaction;version="1.1",*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-
+<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>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-loader</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: Loader</name>
+ <properties>
+ <openejb.osgi.import>
+ org.apache.catalina*;resolution:=optional,
+ !sun.misc.*,
+ org.apache.openejb.*,
+ javax.transaction*;version=1.1,
+ *
+ </openejb.osgi.import>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>5.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>org.apache.openejb,javax.transaction;version="1.1",*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/pom.xml Fri May 14 18:53:32 2010
@@ -17,12 +17,11 @@
<!-- $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">
+<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>
<artifactId>container</artifactId>
<groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
+ <version>3.1.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-core-osgi</artifactId>
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-spring/pom.xml Fri May 14 18:53:32 2010
@@ -1,154 +1,131 @@
-<?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
-
- 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: 685052 $ $Date: 2008-08-11 23:31:13 -0700 (Mon, 11 Aug 2008) $ -->
-
-<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>
- <artifactId>container</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-spring</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: Spring</name>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <version>${version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/TestHandler.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-itests-app</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <artifactId>openejb-itests-client</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.5</version>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>openejb.debug</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions
- -agentlib:jdwp=transport=dt_socket,server=y,address=5005</argLine>
- <workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
- <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
-
+<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>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-spring</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: Spring</name>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ <version>${version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>**/TestHandler.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-itests-app</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-itests-beans</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <artifactId>openejb-itests-client</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>2.5.5</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>openejb.debug</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <argLine>"-javaagent:${basedir}/target/openejb-javaagent-${version}.jar" -enableassertions
+ -agentlib:jdwp=transport=dt_socket,server=y,address=5005</argLine>
+ <workingDirectory>${basedir}/target</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>openejb.home</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml?rev=944388&r1=944387&r2=944388&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/pom.xml Fri May 14 18:53:32 2010
@@ -1,38 +1,21 @@
-<?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
-
- 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.
---><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>
- <artifactId>openejb</artifactId>
- <groupId>org.apache.geronimo.ext.openejb</groupId>
- <version>3.1.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>container</artifactId>
- <packaging>pom</packaging>
- <name>OpenEJB :: Container</name>
- <modules>
- <module>openejb-api</module>
- <module>openejb-core</module>
- <module>openejb-loader</module>
- <module>openejb-javaagent</module>
- <module>openejb-jee</module>
- <module>openejb-spring</module>
- <module>openejb-osgi</module>
- <module>openejb-activemq4</module>
- </modules>
+<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>
+ <artifactId>openejb</artifactId>
+ <groupId>org.apache.geronimo.ext.openejb</groupId>
+ <version>3.1.3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>container</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenEJB :: Container</name>
+ <modules>
+ <module>openejb-api</module>
+ <module>openejb-core</module>
+ <module>openejb-loader</module>
+ <module>openejb-javaagent</module>
+ <module>openejb-jee</module>
+ <module>openejb-spring</module>
+ <module>openejb-osgi</module>
+ <module>openejb-activemq4</module>
+ </modules>
</project>
\ No newline at end of file