You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2004/05/18 10:29:29 UTC
cvs commit: incubator-geronimo/modules/jetty/src/etc/META-INF geronimo-service.xml
dblevins 2004/05/18 01:29:29
Modified: modules/assembly maven.xml
modules/assembly/src/plan j2ee-server-plan.xml
modules/jetty/src/etc/META-INF geronimo-service.xml
Log:
Commented out the ActiveMQ gbeans till they can be fixed.
Added temporary hack for GERONIMO-235. This is fine for now, but we
can't ship with this hack.
Revision Changes Path
1.11 +5 -1 incubator-geronimo/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 25 Apr 2004 23:21:50 -0000 1.10
+++ maven.xml 18 May 2004 08:29:28 -0000 1.11
@@ -107,7 +107,11 @@
</j:forEach>
</ant:fileset>
</ant:copy>
+
+ <ant:mkdirs dir="${distDir}/repository/jdk/jars"/>
+ <ant:copy file="${java.home}/../lib/tools.jar" todir="${distDir}/repository/jdk/jars">
+ </ant:copy>
<ant:copy todir="${distDir}/repository">
<mapper type="glob" from="${maven.repo.local}*" to="*"/>
<ant:fileset dir="${maven.repo.local}">
1.15 +2 -2 incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- j2ee-server-plan.xml 16 May 2004 20:27:46 -0000 1.14
+++ j2ee-server-plan.xml 18 May 2004 08:29:29 -0000 1.15
@@ -103,7 +103,7 @@
<!-- <attribute name="MaxIdleTime" type="int">10</attribute>-->
</gbean>
- <!-- JMS container -->
+ <!-- JMS container
<gbean name="geronimo.server:type=JMSServer,container=ActiveMQ" class="org.codehaus.activemq.container.ActiveMQContainer">
</gbean>
@@ -111,7 +111,7 @@
<attribute name="Url" type="java.lang.String">tcp://localhost:61616</attribute>
<reference name="ActiveMQContainer">geronimo.server:type=JMSServer,container=ActiveMQ</reference>
</gbean>
-
+-->
<!-- EJB container -->
<gbean name="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
1.10 +3 -0 incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml
Index: geronimo-service.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geronimo-service.xml 14 May 2004 00:06:31 -0000 1.9
+++ geronimo-service.xml 18 May 2004 08:29:29 -0000 1.10
@@ -32,4 +32,7 @@
<dependency>
<uri>ant/jars/ant-1.5.jar</uri>
</dependency>
+ <dependency>
+ <uri>jdk/jars/tools.jar</uri>
+ </dependency>
</service>