geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r326794 [7/7] - in /geronimo/trunk: assemblies/j2ee-server/ assemblies/j2ee-server/src/var/config/ configs/ configs/activemq-broker/ configs/activemq-broker/src/ configs/activemq-broker/src/plan/ configs/activemq/ configs/activemq/src/ conf...
Date Thu, 20 Oct 2005 03:48:18 GMT
Added: geronimo/trunk/configs/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/project.xml?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/tomcat/project.xml (added)
+++ geronimo/trunk/configs/tomcat/project.xml Wed Oct 19 20:47:40 2005
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 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.
+-->
+
+<!-- $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+    <id>tomcat</id>
+    <name>Tomcat Configuration for the J2EE Server</name>
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-activation</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-timer</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-jmxremoting</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-client</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-servicemix</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${concurrent_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+            <version>${tranql_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+            <version>${openejb_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>howl</groupId>
+            <artifactId>howl-logger</artifactId>
+            <version>${howl_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlr_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+            <version>${regexp_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <version>${xpp3_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management</artifactId>
+            <version>${activemq_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+            <version>${activeio_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jetty</groupId>
+            <artifactId>org.mortbay.jetty</artifactId>
+            <version>${jetty_version}</version>
+        </dependency>
+    </dependencies>
+</project>
+

Added: geronimo/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/src/plan/plan.xml?rev=326794&view=auto
==============================================================================
--- geronimo/trunk/configs/tomcat/src/plan/plan.xml (added)
+++ geronimo/trunk/configs/tomcat/src/plan/plan.xml Wed Oct 19 20:47:40 2005
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004-2005 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.
+-->
+
+<!-- $Rev: 263024 $ $Date: 2005-08-27 19:24:05 -0700 (Sat, 27 Aug 2005) $ -->
+
+<!--
+Configuration for Tomcat server.
+-->
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
+               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
+    >
+
+    <dependency>
+        <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/catalina-optional-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-http-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/servlets-default-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/servlets-invoker-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-beanutils/jars/commons-beanutils-${commons_beanutils_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-collections/jars/commons-collections-${commons_collections_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-digester/jars/commons-digester-${commons_digester_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-modeler/jars/commons-modeler-${commons_modeler_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>mx4j/jars/mx4j-${mx4j_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/jasper-compiler-${jasper_version}.jar</uri>
+    </dependency>
+    <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>tomcat/jars/tomcat-ajp-${tomcat_ajp_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
+    </dependency>
+
+    <!-- david jencks is not convinced that this gbean should be in this plan and thinks
it might
+    belong in the console plan -->
+    <gbean name="TomcatWebManager" class="org.apache.geronimo.tomcat.TomcatManagerImpl">
+    </gbean>
+
+    <!-- The following is the equivalent of the server.xml file, but done with GBeans
-->
+
+    <!-- The TomcatContainer/Service -->
+    <gbean name="TomcatWebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
+        <attribute name="catalinaHome">var/catalina</attribute>
+        <reference name="EngineGBean">
+            <name>TomcatEngine</name>
+        </reference>
+        <reference name="ServerInfo">
+            <module>org/apache/geronimo/System</module>
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
+        <attribute name="name">HTTP</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPPort2}</attribute>
+        <attribute name="maxHttpHeaderSizeBytes">8192</attribute>
+        <attribute name="maxThreads">150</attribute>
+        <attribute name="minSpareThreads">25</attribute>
+        <attribute name="maxSpareThreads">75</attribute>
+        <attribute name="hostLookupEnabled">false</attribute>
+        <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
+        <attribute name="acceptQueueSize">100</attribute>
+        <attribute name="connectionTimeoutMillis">20000</attribute>
+        <attribute name="uploadTimeoutEnabled">false</attribute>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TomcatAJPConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
+        <attribute name="protocol">AJP</attribute>
+        <attribute name="name">AJP</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanAJPPort2}</attribute>
+        <attribute name="hostLookupEnabled">false</attribute>
+        <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
+    </gbean>
+
+    <!-- SSL support
+    NOTE: If keystoreFile is a relative path, it is relative to GERONIMO_HOME
+    -->
+    <gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.HttpsConnectorGBean">
+        <attribute name="name">HTTPS</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanHTTPSPort2}</attribute>
+        <attribute name="maxHttpHeaderSizeBytes">8192</attribute>
+        <attribute name="maxThreads">150</attribute>
+        <attribute name="minSpareThreads">25</attribute>
+        <attribute name="maxSpareThreads">75</attribute>
+        <attribute name="hostLookupEnabled">false</attribute>
+        <attribute name="acceptQueueSize">100</attribute>
+        <attribute name="uploadTimeoutEnabled">false</attribute>
+        <attribute name="clientAuthRequired">false</attribute>
+        <attribute name="algorithm">Default</attribute>
+        <attribute name="secureProtocol">TLS</attribute>
+        <attribute name="keystoreFileName">var/security/keystore</attribute>
+        <attribute name="keystorePassword">secret</attribute>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
+        <reference name="ServerInfo">
+            <module>org/apache/geronimo/System</module>
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!-- Engine -->
+    <gbean name="TomcatEngine" class="org.apache.geronimo.tomcat.EngineGBean">
+        <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
+        <attribute name="initParams">
+            name=Geronimo
+            defaultHost=${PlanServerHostname}
+        </attribute>
+        <references name="Hosts">
+            <pattern>
+                <gbean-name>geronimo.server:j2eeType=Host,*</gbean-name>
+            </pattern>
+        </references>
+        <reference name="RealmGBean">
+            <name>TomcatJAASRealm</name>
+        </reference>
+        <reference name="TomcatValveChain">
+            <name>FirstValve</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
+        <reference name="ServerInfo">
+            <module>org/apache/geronimo/System</module>
+            <name>ServerInfo</name>
+        </reference>
+        <references name="LogGBeans">
+            <pattern>
+                <!-- This is lame and should be replaced by an interface reference -->
+                <gbean-name>geronimo.server:name=FirstValve,*</gbean-name>
+            </pattern>
+        </references>
+    </gbean>
+
+    <!-- Valve -->
+    <gbean name="FirstValve" class="org.apache.geronimo.tomcat.ValveGBean">
+        <attribute name="className">org.apache.catalina.valves.AccessLogValve</attribute>
+        <attribute name="initParams">
+            prefix=${PlanServerHostname}_access_log.
+            suffix=.txt
+            pattern=common
+        </attribute>
+        <!-- Uncomment this section to add second valve for a chain.  This example consists
of the Tomcat
+              AccessLogValve and SingleSignOn. Notice the dependency that chains the FirstValve
with the
+              SecondValve.  The valves will be added in the order that they are chained.
+            <reference name="NextValve"><moduleType>J2EEModule</moduleType><name>SecondValve</name></reference>
+        -->
+    </gbean>
+    <!-- Uncomment this section to add this valve  to the chain.  This example consists
of the Tomcat
+          SingleSignOn.
+    <gbean name="SecondValve" class="org.apache.geronimo.tomcat.ValveGBean">
+        <attribute name="className">org.apache.catalina.authenticator.SingleSignOn</attribute>
+    </gbean>
+    -->
+
+    <!-- Realm -->
+    <!-- This is an example TomcatJAASRealm -->
+    <gbean name="TomcatJAASRealm" class="org.apache.geronimo.tomcat.RealmGBean">
+        <attribute name="className">org.apache.geronimo.tomcat.realm.TomcatJAASRealm</attribute>
+        <attribute name="initParams">
+            userClassNames=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal
+            roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal
+        </attribute>
+    </gbean>
+
+    <!-- Host -->
+    <gbean name="TomcatHost" class="org.apache.geronimo.tomcat.HostGBean">
+        <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
+        <attribute name="initParams">
+            name=${PlanServerHostname}
+            appBase=
+            workDir=work
+        </attribute>
+        <!-- You may attach a Realm to a Host as well.  Only attach to the Engine *or*
the Host.
+             Attempting to add the same Realm GBeans to the Engine *and* Host at the same
time
+             will result in an error.
+
+             Uncomment this to add the Realm to the Host
+        <reference name="RealmGBean">
+            <name>TomcatJAASRealm</name>
+        </reference>
+        -->
+        <!-- You may attach a Valve chain to a Host as well.  Only attach to the Engine
*or* the Host.
+             Attempting to add the same valve GBeans to the Engine *and* Host at the same
time
+             will result in an error.
+
+             Uncomment this to add the valve chain to the Host
+        <reference name="TomcatValveChain">
+            <name>FirstValve</name>
+        </reference>
+        -->
+    </gbean>
+
+    <!-- TOMCAT CONFIGURATION ENDS HERE -->
+
+</configuration>

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=326794&r1=326793&r2=326794&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Wed Oct 19 20:47:40 2005
@@ -23,6 +23,8 @@
     xmlns:artifact="artifact"
     xmlns:ant="jelly:ant"
     xmlns:define="jelly:define"
+    xmlns:m="jelly:maven"
+    xmlns:velocity="jelly:velocity"
     xmlns:assemble="geronimo:assembly"
     >
 
@@ -35,6 +37,8 @@
         <ant:copy todir="${geronimo.assembly.dest}">
             <ant:fileset dir="${geronimo.assembly.src}"/>
         </ant:copy>
+        <ant:mkdir dir="${geronimo.assembly.dest}/var/config"/>
+        <velocity:merge basedir="${geronimo.assembly.src}/var/config" template="config.xml"
name="${geronimo.assembly.dest}/var/config/config.xml"/>
     </goal>
 
     <goal name="geronimo:assemble-lib">
@@ -98,9 +102,80 @@
         <ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar" basedir="${geronimo.assembly.dest}"/>
     </goal>
 
-    <goal name="geronimo:install-assembly" prereqs="geronimo:jar-assembly" description="Install
an assembled Geronimo installation into the local repository">
-        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" project="${pom}"/>
-    </goal>
+    <goal name="geronimo:package-assembly" prereqs="geronimo:assemble" description="Build
the binary distribution.">
+        <!-- Create a tar.gz file -->
+        <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
+            <ant:tar longfile="gnu" compression="gzip" tarfile="${maven.build.dir}/${maven.final.name}.tar.gz">
+                <ant:tarfileset dir="${geronimo.assembly.dest}/..">
+                    <ant:include name="${geronimo.assembly.name}/**"/>
+                    <ant:exclude name="${geronimo.assembly.name}/var/log/*.log"/>
+                </ant:tarfileset>
+            </ant:tar>
+            <checksum file="${maven.build.dir}/${maven.final.name}.tar.gz" algorithm="MD5"
fileext=".md5"/>
+            <checksum file="${maven.build.dir}/${maven.final.name}.tar.gz" algorithm="SHA"
fileext=".sha"/>
+        </j:if>
+
+        <!-- Create a zip file -->
+        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
+            <ant:zip zipfile="${maven.build.dir}/${maven.final.name}.zip">
+                <ant:zipfileset dir="${geronimo.assembly.dest}/..">
+                    <ant:include name="${geronimo.assembly.name}/**"/>
+                    <ant:exclude name="${geronimo.assembly.name}/var/log/*.log"/>
+                </ant:zipfileset>
+            </ant:zip>
+            <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="MD5"
fileext=".md5"/>
+            <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="SHA"
fileext=".sha"/>
+        </j:if>
+    </goal>
+
+    <!-- Maven artifict tags are broken so we must copy by hand -->
+    <goal name="geronimo:install-assembly" description="Deploy a binary distribution"
prereqs="geronimo:package-assembly">
+        <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
+            <ant:mkdir dir="${maven.repo.local}/${pom.groupId}/distributions"/>
+            <ant:copy file="${maven.build.dir}/${maven.final.name}.tar.gz"
+                todir="${maven.repo.local}/${pom.groupId}/distributions"/>
+<!--            <artifact:install-->
+<!--                artifact="${maven.build.dir}/${maven.final.name}.tar.gz"-->
+<!--                type="distribution-targz"-->
+<!--                project="${pom}"-->
+        </j:if>
+
+        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
+            <ant:mkdir dir="${maven.repo.local}/${pom.groupId}/distributions"/>
+            <ant:copy file="${maven.build.dir}/${maven.final.name}.zip"
+                todir="${maven.repo.local}/${pom.groupId}/distributions"/>
+<!--            <artifact:install-->
+<!--                artifact="${maven.build.dir}/${maven.final.name}.zip"-->
+<!--                type="distribution-zip"-->
+<!--                project="${pom}"-->
+        </j:if>
+    </goal>
+
+    <!-- ================================================================== -->
+    <!-- D E P L O Y   D I S T R I B U T I O N                              -->
+    <!-- ================================================================== -->
+
+<!--    <goal name="geronimo:deploy-assembly" description="Deploy a binary distribution"
prereqs="geronimo:package-assembly">-->
+<!--        <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">-->
+<!--            <artifact:deploy-->
+<!--                artifact="${maven.build.dir}/${maven.final.name}.tar.gz"-->
+<!--                type="distribution-targz"-->
+<!--                project="${pom}"-->
+<!--                typeHandler="${distTypeHandler}"/>-->
+<!--        </j:if>-->
+<!---->
+<!--        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">-->
+<!--            <artifact:deploy-->
+<!--                artifact="${maven.build.dir}/${maven.final.name}.zip"-->
+<!--                type="distribution-zip"-->
+<!--                project="${pom}"-->
+<!--                typeHandler="${distTypeHandler}"/>-->
+<!--        </j:if>-->
+<!--    </goal>-->
+
+<!--    <goal name="geronimo:install-assembly" prereqs="geronimo:jar-assembly" description="Install
an assembled Geronimo installation into the local repository">-->
+<!--        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar"
project="${pom}"/>-->
+<!--    </goal>-->
 
     <!--
         <goal name="geronimo:deploy-assembly" prereqs="geronimo:assemble" description="Deploy
an assembled Geronimo installation into the remote repository">

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties?rev=326794&r1=326793&r2=326794&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties Wed Oct 19 20:47:40
2005
@@ -19,5 +19,11 @@
 ## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
 ##
 
-geronimo.assembly.dest=${maven.build.dir}/assembly
+geronimo.assembly.name=geronimo-${pom.currentVersion}
+geronimo.assembly.dest=${maven.build.dir}/${geronimo.assembly.name}
 geronimo.assembly.src=${basedir}/src
+
+geronimo.assembly.tar=true
+geronimo.assembly.zip=true
+
+geronimo.assembly.distributions.dir=${maven.build.dir}/distributions
\ No newline at end of file



Mime
View raw message