tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1021446 - in /openejb/branches/openejb-3.1.3: ./ assembly/openejb-tomcat/openejb-tomcat-bundle/ container/openejb-core/src/test/java/org/apache/openejb/config/ examples/alternate-descriptors/src/main/resources/META-INF/
Date Mon, 11 Oct 2010 17:54:58 GMT
Author: dblevins
Date: Mon Oct 11 17:54:58 2010
New Revision: 1021446

URL: http://svn.apache.org/viewvc?rev=1021446&view=rev
Log:
svn merge -r 1021444:1021445 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x

http://svn.apache.org/viewvc?rev=1021445&view=rev
------------------------------------------------------------------------
r1021445 | dblevins | 2010-10-11 10:53:20 -0700 (Mon, 11 Oct 2010) | 2 lines

Maven deploy uploads tomtom-313-SNAPSHOT.zip despite what the final assembly is called, so
renamed the version to be as intended.

------------------------------------------------------------------------

Modified:
    openejb/branches/openejb-3.1.3/   (props changed)
    openejb/branches/openejb-3.1.3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
    openejb/branches/openejb-3.1.3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
  (props changed)
    openejb/branches/openejb-3.1.3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
  (props changed)

Propchange: openejb/branches/openejb-3.1.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 11 17:54:58 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1:779593
-/openejb/branches/openejb-3.1.x:1021442
+/openejb/branches/openejb-3.1.x:1021442,1021445
 /openejb/trunk/openejb3:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030

Modified: openejb/branches/openejb-3.1.3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml?rev=1021446&r1=1021445&r2=1021446&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml (original)
+++ openejb/branches/openejb-3.1.3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml Mon
Oct 11 17:54:58 2010
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tomtom</artifactId>
     <packaging>jar</packaging>
-    <version>313</version>
+    <version>6.0.26.313</version>
     <name>OpenEJB :: Assembly :: Tomcat :: Bundle</name>
     <properties>
         <tomcat.version>6.0.26</tomcat.version>
@@ -131,7 +131,7 @@
                         <id>war</id>
                         <phase>package</phase>
                         <configuration>
-                            <finalName>${artifactId}-${tomcat.version}.${version}</finalName>
+                            <finalName>${artifactId}-${version}</finalName>
                         </configuration>
                         <goals>
                             <goal>attached</goal>

Propchange: openejb/branches/openejb-3.1.3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 11 17:54:58 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1021442
+/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1021442,1021445
 /openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172

Propchange: openejb/branches/openejb-3.1.3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 11 17:54:58 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1021442
+/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1021442,1021445
 /openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030



Mime
View raw message