You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/05/27 23:05:06 UTC
svn commit: r949000 - in /openejb/branches/openejb-3.1.x: ./
assembly/openejb-tomcat/openejb-tomcat-bundle/
container/openejb-core/src/test/java/org/apache/openejb/config/
examples/alternate-descriptors/src/main/resources/META-INF/
Author: dblevins
Date: Thu May 27 21:05:06 2010
New Revision: 949000
URL: http://svn.apache.org/viewvc?rev=949000&view=rev
Log:
svn merge -r 948547:948548 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=948548&view=rev
------------------------------------------------------------------------
r948548 | jgallimore | 2010-05-26 12:29:43 -0700 (Wed, 26 May 2010) | 1 line
OPENEJB-1283 including examples war in bundle
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.1.x/ (props changed)
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml
openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
Propchange: openejb/branches/openejb-3.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 21:05:06 2010
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1:779593
-/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243
+/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml?rev=949000&r1=948999&r2=949000&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml Thu May 27 21:05:06 2010
@@ -29,5 +29,8 @@
<!-- unzip openejb.war -->
<unzip src="${LOCAL_M2_REPO}/org/apache/openejb/openejb-tomcat-webapp/${openejb.version}/openejb-tomcat-webapp-${openejb.version}.war" dest="${OUTPUT_DIR}/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/openejb"/>
+
+ <!-- unzip examples.war -->
+ <unzip src="${LOCAL_M2_REPO}/org/superbiz/ejb-examples/${examples.version}/ejb-examples-${examples.version}.war" dest="${OUTPUT_DIR}/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/ejb-examples"/>
</target>
</project>
Modified: openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml?rev=949000&r1=948999&r2=949000&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml (original)
+++ openejb/branches/openejb-3.1.x/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml Thu May 27 21:05:06 2010
@@ -32,6 +32,7 @@
<name>OpenEJB :: Assembly :: Tomcat :: Bundle</name>
<properties>
<tomcat.version>6.0.26</tomcat.version>
+ <examples.version>1.1-SNAPSHOT</examples.version>
</properties>
<dependencies>
<dependency>
@@ -73,6 +74,7 @@
<property name="LOCAL_M2_REPO" value="${settings.localRepository}"/>
<property name="tomcat.version" value="${tomcat.version}"/>
<property name="openejb.version" value="${version}"/>
+ <property name="examples.version" value="${examples.version}"/>
<ant antfile="${basedir}/build.xml">
<target name="downloadtomcat"/>
Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 21:05:06 2010
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243
+/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548
Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 21:05:06 2010
@@ -1,2 +1,2 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243
+/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548