Author: ate
Date: Thu Mar 9 14:45:56 2006
New Revision: 384636
URL: http://svn.apache.org/viewcvs?rev=384636&view=rev
Log:
Making the jetspeed-2 rss application features also available as separate
jetspeed-rss-<version>.jar.
This should now have the same result for both maven-1 and maven-2 builds.
Added:
portals/jetspeed-2/trunk/applications/rss/rss-war.xml
Modified:
portals/jetspeed-2/trunk/applications/rss/maven.xml
portals/jetspeed-2/trunk/applications/rss/project.properties
portals/jetspeed-2/trunk/applications/rss/project.xml
portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
portals/jetspeed-2/trunk/project.properties
Modified: portals/jetspeed-2/trunk/applications/rss/maven.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/maven.xml?rev=384636&r1=384635&r2=384636&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/maven.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/maven.xml Thu Mar 9 14:45:56 2006
@@ -2,6 +2,8 @@
<project default="java:jar"
xmlns:j="jelly:core"
+ xmlns:artifact="artifact"
+ xmlns:maven="jelly:maven"
xmlns:define="jelly:define">
@@ -23,4 +25,15 @@
<attainGoal name= "java:compile"/>
</preGoal>
+ <goal name="war:install" prereqs="war:war" description="Overrule default
war:install to allow install under different name">
+
+ <!-- load the custom rss-war pom -->
+ <maven:pom var="warPom" projectDescriptor="${basedir}/rss-war.xml"/>
+ <!-- install the war using the custom pom -->
+ <artifact:install
+ artifact="${maven.war.build.dir}/${maven.war.final.name}"
+ type="war"
+ project="${warPom}"/>
+ </goal>
+
</project>
Modified: portals/jetspeed-2/trunk/applications/rss/project.properties
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/project.properties?rev=384636&r1=384635&r2=384636&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/project.properties (original)
+++ portals/jetspeed-2/trunk/applications/rss/project.properties Thu Mar 9
14:45:56 2006
@@ -18,3 +18,4 @@
maven.multiproject.type=war
org.apache.jetspeed.portlet.app.name=rss
+maven.war.final.name=rss.war
\ No newline at end of file
Modified: portals/jetspeed-2/trunk/applications/rss/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/project.xml?rev=384636&r1=384635&r2=384636&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/project.xml Thu Mar 9 14:45:56
2006
@@ -18,7 +18,7 @@
-->
<project>
<extend>${basedir}/../../project-info.xml</extend>
- <artifactId>rss</artifactId>
+ <artifactId>jetspeed-rss</artifactId>
<groupId>org.apache.portals.jetspeed-2</groupId>
<name>Jetspeed-2 Language Selector Portlet</name>
<description>Jetspeed-2 Language Selector Portlet</description>
Modified: portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml?rev=384636&r1=384635&r2=384636&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml Thu Mar 9
14:45:56 2006
@@ -26,7 +26,7 @@
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>rss-jar</artifactId>
+ <artifactId>jetspeed-rss</artifactId>
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
Added: portals/jetspeed-2/trunk/applications/rss/rss-war.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/rss-war.xml?rev=384636&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-war.xml (added)
+++ portals/jetspeed-2/trunk/applications/rss/rss-war.xml Thu Mar 9 14:45:56
2006
@@ -0,0 +1,24 @@
+<?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.
+
+ $Id$
+-->
+<project>
+ <extend>project.xml</extend>
+ <artifactId>rss</artifactId>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <currentVersion>${jetspeed.version}</currentVersion>
+</project>
Modified: portals/jetspeed-2/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=384636&r1=384635&r2=384636&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Thu Mar 9 14:45:56 2006
@@ -93,8 +93,8 @@
maven.multiproject.aggregateDir=multiproject/
maven.multiproject.ignoreFailures=false
-jar.includes=applications/gems/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,content-server/project.xml,jetspeed-api/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml,layout-portlets/project.xml
-jar.excludes=/project.xml,maven-plugin/**,applications/project.xml,applications/demo/**,applications/rss/**,applications/j2-admin/**,site/project.xml,design-docs/project.xml
+jar.includes=applications/gems/project.xml,applications/rss/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,content-server/project.xml,jetspeed-api/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml,layout-portlets/project.xml
+jar.excludes=/project.xml,maven-plugin/**,applications/project.xml,applications/demo/**,applications/j2-admin/**,site/project.xml,design-docs/project.xml
maven.multiproject.site.goals=site pdf dashboard:report-single
# For site only, comment line above, uncomment line below.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
