geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r356445 - in /geronimo/branches/1.0: etc/project.properties plugins/geronimo-packaging-plugin/plugin.jelly plugins/geronimo-packaging-plugin/project.xml
Date Tue, 13 Dec 2005 01:30:08 GMT
Author: djencks
Date: Mon Dec 12 17:30:02 2005
New Revision: 356445

URL: http://svn.apache.org/viewcvs?rev=356445&view=rev
Log:
GERONIMO-1348 packaging plugin must set extensions directory

Modified:
    geronimo/branches/1.0/etc/project.properties
    geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.jelly
    geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml

Modified: geronimo/branches/1.0/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/etc/project.properties?rev=356445&r1=356444&r2=356445&view=diff
==============================================================================
--- geronimo/branches/1.0/etc/project.properties (original)
+++ geronimo/branches/1.0/etc/project.properties Mon Dec 12 17:30:02 2005
@@ -86,7 +86,7 @@
 tranql_connector_version=1.1
 tranql_vendors_version=1.1
 
-geronimo_packaging_plugin_version=1.0.0
+geronimo_packaging_plugin_version=1.0.1
 geronimo_assembly_plugin_version=1.0.2
 geronimo_deployment_plugin_version=1.0.0
 geronimo_dependency_plugin_version=1.0.0

Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.jelly?rev=356445&r1=356444&r2=356445&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.jelly (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/plugin.jelly Mon Dec 12 17:30:02
2005
@@ -1,83 +1,84 @@
-<?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$ $Date$ -->
-
-<project
-    xmlns:artifact="artifact"
-    xmlns:ant="jelly:ant"
-    xmlns:velocity="jelly:velocity"
-    xmlns:define="jelly:define"
-    xmlns:car="geronimo:packaging"
-    >
-    <define:taglib uri="geronimo:packaging">
-        <define:jellybean name="package" className="org.apache.geronimo.plugin.packaging.PackageBuilderShell"
method="execute"/>
-        <define:jellybean name="jmxDistribute" className="org.apache.geronimo.plugin.packaging.JMXDistributor"
method="execute"/>
-        <define:jellybean name="dependencies" className="org.apache.geronimo.plugin.packaging.PlanProcessor"
method="execute"/>
-    </define:taglib>
-
-    <goal name="car" description="Package a Geronimo Configuration" prereqs="car:package"/>
-
-<!--
-    <goal name="car:prepare-plan" description="Prepare a plan by processing with velocity">
-        <ant:mkdir dir="${geronimo.packaging.buildDir}"/>
-        <velocity:merge basedir="${geronimo.packaging.srcDir}" template="${geronimo.packaging.planFile}"
name="${geronimo.packaging.buildFile}"/>
-    </goal>
--->
-
-    <goal name="car:prepare-plan" description="Add dependencies to a plan and process
with velocity">
-        <car:dependencies
-            artifacts="${pom.artifacts}"
-            targetDir="${geronimo.packaging.buildDir}"
-            sourceDir="${geronimo.packaging.srcDir}"
-            planFile="${geronimo.packaging.planFile}"
-            targetFile="${geronimo.packaging.buildFile}"
-            context="${context}"/>
-    </goal>
-
-    <goal name="car:package" prereqs="car:prepare-plan" description="Package a Geronimo
Configuration">
-        <car:package
-            context="${context}"
-            artifacts="${pom.artifacts}"
-            pluginArtifacts="${plugin.artifacts}"
-            repository="${geronimo.packaging.repository}"
-            deploymentConfig="${geronimo.packaging.deploymentConfig}"
-            deployerName="${geronimo.packaging.deployerName}"
-            planFile="${geronimo.packaging.buildFile}"
-            moduleFile="${geronimo.packaging.moduleFile}"
-            packageFile="${maven.build.dir}/${maven.final.name}.car"
-            mainClass="${geronimo.packaging.mainClass}"
-            classPath="${geronimo.packaging.classPath}"
-            endorsedDirs="${geronimo.packaging.endorsedDirs}"
-            />
-    </goal>
-
-    <goal name="car:install" prereqs="car:package" description="Install the package in
the local repository">
-        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.car" type="car"
project="${pom}"/>
-    </goal>
-
-    <goal name="car:distribute" prereqs="car:package" description="Distribute the package
to a server">
-        <car:jmxDistribute
-            user="${geronimo.packaging.user}"
-            password="${geronimo.packaging.password}"
-            url="${geronimo.packaging.url}"
-            storeName="${geronimo.packaging.storeName}"
-            artifact="${maven.build.dir}/${maven.final.name}.car"
-            />
-    </goal>
-</project>
+<?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$ $Date$ -->
+
+<project
+    xmlns:artifact="artifact"
+    xmlns:ant="jelly:ant"
+    xmlns:velocity="jelly:velocity"
+    xmlns:define="jelly:define"
+    xmlns:car="geronimo:packaging"
+    >
+    <define:taglib uri="geronimo:packaging">
+        <define:jellybean name="package" className="org.apache.geronimo.plugin.packaging.PackageBuilderShell"
method="execute"/>
+        <define:jellybean name="jmxDistribute" className="org.apache.geronimo.plugin.packaging.JMXDistributor"
method="execute"/>
+        <define:jellybean name="dependencies" className="org.apache.geronimo.plugin.packaging.PlanProcessor"
method="execute"/>
+    </define:taglib>
+
+    <goal name="car" description="Package a Geronimo Configuration" prereqs="car:package"/>
+
+<!--
+    <goal name="car:prepare-plan" description="Prepare a plan by processing with velocity">
+        <ant:mkdir dir="${geronimo.packaging.buildDir}"/>
+        <velocity:merge basedir="${geronimo.packaging.srcDir}" template="${geronimo.packaging.planFile}"
name="${geronimo.packaging.buildFile}"/>
+    </goal>
+-->
+
+    <goal name="car:prepare-plan" description="Add dependencies to a plan and process
with velocity">
+        <car:dependencies
+            artifacts="${pom.artifacts}"
+            targetDir="${geronimo.packaging.buildDir}"
+            sourceDir="${geronimo.packaging.srcDir}"
+            planFile="${geronimo.packaging.planFile}"
+            targetFile="${geronimo.packaging.buildFile}"
+            context="${context}"/>
+    </goal>
+
+    <goal name="car:package" prereqs="car:prepare-plan" description="Package a Geronimo
Configuration">
+        <car:package
+            context="${context}"
+            artifacts="${pom.artifacts}"
+            pluginArtifacts="${plugin.artifacts}"
+            repository="${geronimo.packaging.repository}"
+            deploymentConfig="${geronimo.packaging.deploymentConfig}"
+            deployerName="${geronimo.packaging.deployerName}"
+            planFile="${geronimo.packaging.buildFile}"
+            moduleFile="${geronimo.packaging.moduleFile}"
+            packageFile="${maven.build.dir}/${maven.final.name}.car"
+            mainClass="${geronimo.packaging.mainClass}"
+            classPath="${geronimo.packaging.classPath}"
+            endorsedDirs="${geronimo.packaging.endorsedDirs}"
+            extensionDirs="${geronimo.packaging.extensionDirs}"
+            />
+    </goal>
+
+    <goal name="car:install" prereqs="car:package" description="Install the package in
the local repository">
+        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.car" type="car"
project="${pom}"/>
+    </goal>
+
+    <goal name="car:distribute" prereqs="car:package" description="Distribute the package
to a server">
+        <car:jmxDistribute
+            user="${geronimo.packaging.user}"
+            password="${geronimo.packaging.password}"
+            url="${geronimo.packaging.url}"
+            storeName="${geronimo.packaging.storeName}"
+            artifact="${maven.build.dir}/${maven.final.name}.car"
+            />
+    </goal>
+</project>

Modified: geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml?rev=356445&r1=356444&r2=356445&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/branches/1.0/plugins/geronimo-packaging-plugin/project.xml Mon Dec 12 17:30:02
2005
@@ -22,7 +22,7 @@
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
     <name>Geronimo :: Maven Packaging Plugin</name>
-    <currentVersion>1.0.0</currentVersion>
+    <currentVersion>1.0.1</currentVersion>
 
     <dependencies>
         <dependency>



Mime
View raw message