geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r124820 - /geronimo/trunk/etc/maven.xml /geronimo/trunk/etc/project.xml /geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml /geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd
Date Mon, 10 Jan 2005 18:54:50 GMT
Author: djencks
Date: Mon Jan 10 10:54:49 2005
New Revision: 124820

URL: http://svn.apache.org/viewcvs?view=rev&rev=124820
Log:
Filter geronimo-service.xml files and include them automatically when present
Added:
   geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml
Modified:
   geronimo/trunk/etc/maven.xml
   geronimo/trunk/etc/project.xml
   geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd

Modified: geronimo/trunk/etc/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/etc/maven.xml?view=diff&rev=124820&p1=geronimo/trunk/etc/maven.xml&r1=124819&p2=geronimo/trunk/etc/maven.xml&r2=124820
==============================================================================
--- geronimo/trunk/etc/maven.xml	(original)
+++ geronimo/trunk/etc/maven.xml	Mon Jan 10 10:54:49 2005
@@ -25,6 +25,7 @@
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
     xmlns:define="jelly:define"
+    xmlns:velocity="jelly:velocity"
     >
 
     <!-- ================= -->
@@ -83,6 +84,31 @@
             </ant:depend>
         </j:if>
     </preGoal>
+
+    <!-- Copy and filter dependency lists for inclusion in generated jar. -->
+    <postGoal name="java:compile">
+        <u:available file="${basedir}/src/etc/META-INF/geronimo-service.xml">
+            <j:set var="geronimo.service.file.exists" value="true"/>
+        </u:available>
+        <j:if test="${context.getVariable('geronimo.service.file.exists')}">
+            <!-- Preprocess all plans using velocity  -->
+            <ant:mkdir dir="${basedir}/target/etc/META-INF"/>
+            <fileScanner var="plans">
+                <fileset dir="${basedir}/src/etc/META-INF">
+                    <include name="geronimo-service.xml"/>
+                </fileset>
+            </fileScanner>
+
+            <j:forEach var="plan" items="${plans.iterator()}">
+                <j:set var="planName" value="${plan.name}"/>
+                <echo>Preprocessing ${planName}</echo>
+                <velocity:merge
+                    basedir="${basedir}/src/etc/META-INF"
+                    template="${planName}"
+                    name="${basedir}/target/etc/META-INF/${planName}"/>
+            </j:forEach>
+        </j:if>
+    </postGoal>
 
     <!-- Remove the log files -->
     <goal name="clobber"

Modified: geronimo/trunk/etc/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.xml?view=diff&rev=124820&p1=geronimo/trunk/etc/project.xml&r1=124819&p2=geronimo/trunk/etc/project.xml&r2=124820
==============================================================================
--- geronimo/trunk/etc/project.xml	(original)
+++ geronimo/trunk/etc/project.xml	Mon Jan 10 10:54:49 2005
@@ -293,6 +293,20 @@
         </contributor>
     </contributors>
 
+    <dependencies>
+        <!-- Used for preprocessing our plans -->
+        <dependency>
+            <groupId>commons-jelly</groupId>
+            <artifactId>commons-jelly-tags-velocity</artifactId>
+            <version>${jelly_velocity_tags_version}</version>
+        </dependency>
+        <dependency>
+            <groupId> velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>${velocity_version}</version>
+        </dependency>
+
+    </dependencies>
 
     <!-- =================== -->
     <!-- Build Specification -->
@@ -320,6 +334,12 @@
                 <directory>${basedir}/target/xmlbeans</directory>
                 <includes>
                     <include>schema/**/*.xsb</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/target/etc</directory>
+                <includes>
+                    <include>META-INF/geronimo-service.xml</include>
                 </includes>
             </resource>
         </resources>

Added: geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml?view=auto&rev=124820
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml	Mon Jan 10 10:54:49
2005
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+
+<!--dependencies for jetty-->
+<service xmlns="http://geronimo.apache.org/xml/ns/deployment">
+
+    <dependency>
+        <uri>jetty/jars/org.mortbay.jetty-${jetty_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/jasper-compiler-${jasper_version}.jar</uri>
+    </dependency>
+    <!--this is the eclipse compiler-->
+    <dependency>
+        <uri>tomcat/jars/jasper-compiler-jdt-${jasper_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/jasper-runtime-${jasper_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
+    </dependency>
+
+</service>
\ No newline at end of file

Modified: geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd?view=diff&rev=124820&p1=geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd&r1=124819&p2=geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd&r2=124820
==============================================================================
--- geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd	(original)
+++ geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd	Mon Jan 10 10:54:49
2005
@@ -28,7 +28,7 @@
             Schema for Geronimo Service component definition files .
             Instance documents should begin with the element:
 
-            &gt;gbeans xmlns="http://geronimo.apache.org/xml/ns/deployment"&lt;
+            &gt;service xmlns="http://geronimo.apache.org/xml/ns/deployment"&lt;
         </xs:documentation>
     </xs:annotation>
 

Mime
View raw message