You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2004/02/13 00:21:53 UTC
cvs commit: incubator-geronimo/modules/jetty/src/etc/META-INF geronimo-service.xml
jboynes 2004/02/12 15:21:53
Modified: modules/jetty project.xml
modules/jetty/src/etc/META-INF geronimo-service.xml
Log:
Switch to new component definition file and include in main jar
Revision Changes Path
1.14 +6 -1 incubator-geronimo/modules/jetty/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/jetty/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 12 Feb 2004 20:38:18 -0000 1.13
+++ project.xml 12 Feb 2004 23:21:53 -0000 1.14
@@ -226,6 +226,11 @@
<!-- =================== -->
<build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/etc</directory>
+ </resource>
+ </resources>
<unitTest>
<includes>
<include>**/*Test.java</include>
1.7 +17 -22 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geronimo-service.xml 3 Feb 2004 03:46:44 -0000 1.6
+++ geronimo-service.xml 12 Feb 2004 23:21:53 -0000 1.7
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<gbeans>
- <path>geronimo-jetty-DEV.jar</path>
- <path>org.mortbay.jetty-5.0.beta0.jar</path>
- <path>geronimo-spec-servlet-DEV.jar</path>
- <path>geronimo-spec-jsp-DEV.jar</path>
- <path>jasper-compiler-5.0.16.jar</path>
- <path>jasper-runtime-5.0.16.jar</path>
- <path>commons-el-1.0.jar</path>
- <path>ant-1.5.jar</path>
-
- <gbean class="org.apache.geronimo.jetty.JettyContainerImpl" objectName="geronimo.web:type=WebContainer,container=Jetty">
- </gbean>
-
- <gbean class="org.apache.geronimo.jetty.connector.HTTPConnector" objectName="geronimo.web:type=WebConnector,container=Jetty,port=8080">
- <default attribute="Port" type="int">8080</default>
- <endpoint name="JettyContainer">
- <pattern>geronimo.web:type=WebContainer,container=Jetty</pattern>
- </endpoint>
-<!-- <default attribute="MaxConnections" type="int">10</default>-->
-<!-- <default attribute="MaxIdleTime" type="int">10</default>-->
- </gbean>
-</gbeans>
+<service xmlns="http://geronimo.apache.org/xml/ns/deployment">
+ <dependency>
+ <uri>jetty/jars/org.mortbay.jetty-5.0.beta0.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/jasper-compiler-5.0.16.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/jasper-runtime-5.0.16.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>commons-el/jars/commons-el-1.0.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>ant/jars/ant-1.5.jar</uri>
+ </dependency>
+</service>