You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-dev@portals.apache.org by cz...@apache.org on 2004/02/06 08:57:10 UTC
cvs commit: jakarta-pluto/deploy project.xml
cziegeler 2004/02/05 23:57:10
Modified: . maven.xml project.xml build.properties.sample
xdocs install.xml navigation.xml
portal maven.xml project.xml project.properties
testsuite maven.xml project.xml
container project.xml maven.xml
deploy project.xml
Log:
Apply patch from David H. DeWolf to use the Maven multi-project feature
Revision Changes Path
1.6 +23 -75 jakarta-pluto/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 29 Jan 2004 08:11:28 -0000 1.5
+++ maven.xml 6 Feb 2004 07:57:09 -0000 1.6
@@ -1,84 +1,33 @@
-<project default="java:jar"
+<project default="multiproject:artifact"
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
-
+
<preGoal name="xdoc:jelly-transform">
<attainGoal name="faq"/>
</preGoal>
-
- <goal name="allClean"
- description="Cleans a project targets">
- <attainGoal name="clean" />
- <maven:reactor
- basedir="${basedir}"
- includes="container/project.xml"
- goals="clean"
- banner="Cleaning Container"
- postProcessing="false"
- ignoreFailures="false"/>
- <maven:reactor
- basedir="${basedir}"
- includes="portal/project.xml"
- goals="clean"
- banner="Cleaning Portal"
- postProcessing="false"
- ignoreFailures="false"/>
- <maven:reactor
- basedir="${basedir}"
- includes="api/project.xml"
- goals="clean"
- banner="Cleaning API"
- postProcessing="false"
- ignoreFailures="false"/>
- <maven:reactor
- basedir="${basedir}"
- includes="testsuite/project.xml"
- goals="clean"
- banner="Cleaning Test Suitet"
- postProcessing="false"
- ignoreFailures="false"/>
- </goal>
-
-
-
-
-
-
- <goal name="fullDeployment" >
-
- <maven:reactor
- basedir="${basedir}"
- includes="api/project.xml"
- goals="jar:install"
- banner="Installing api jar"
- postProcessing="false"
- ignoreFailures="false"/>
-
- <maven:reactor
- basedir="${basedir}"
- includes="container/project.xml"
- goals="jar:install"
- banner="Installing container jar"
- postProcessing="false"
- ignoreFailures="false"/>
- <maven:reactor
- basedir="${basedir}"
- includes="portal/project.xml"
- goals="jar:install,deployPlutoToTomcat"
- banner="Deploying Portal"
- postProcessing="false"
- ignoreFailures="false"/>
- <maven:reactor
- basedir="${basedir}"
- includes="testsuite/project.xml"
- goals="deployTestsuite"
- banner="Deploying Test Suite to Pluto"
- postProcessing="false"
- ignoreFailures="false"/>
+ <preGoal name="fullDeployment">
+ <attainGoal name="multiproject:install"/>
+ </preGoal>
+
+ <goal name="fullDeployment">
+ <maven:reactor
+ basedir="${basedir}"
+ includes="portal/project.xml"
+ goals="tomcat:deploy"
+ banner="Deploying Portal"
+ postProcessing="false"
+ ignoreFailures="false"/>
+ <maven:reactor
+ basedir="${basedir}"
+ includes="testsuite/project.xml"
+ goals="deployTestsuite"
+ banner="Deploying Test Suite to Pluto"
+ postProcessing="false"
+ ignoreFailures="false"/>
</goal>
-
+
<goal name="deploy">
<attainGoal name="fullDeployment" />
@@ -90,7 +39,6 @@
postProcessing="false"
ignoreFailures="false"/>
</goal>
-
-
+
</project>
1.13 +1 -2 jakarta-pluto/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 30 Jan 2004 10:49:04 -0000 1.12
+++ project.xml 6 Feb 2004 07:57:09 -0000 1.13
@@ -200,7 +200,7 @@
<contributors>
<contributor>
<name>David H. DeWolf</name>
- <email>david.AT.daviddewolf.DOT.com</email>
+ <email>david{aT}daviddewolf{d0t}com</email>
</contributor>
</contributors>
@@ -253,5 +253,4 @@
-->
<report>maven-tasklist-plugin</report>
</reports>
-
</project>
1.3 +2 -2 jakarta-pluto/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-pluto/build.properties.sample,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties.sample 16 Jan 2004 13:28:42 -0000 1.2
+++ build.properties.sample 6 Feb 2004 07:57:09 -0000 1.3
@@ -6,5 +6,5 @@
# location of the Tomcat install where you want to deploy Pluto
# do not use backslashes in this path
-tomcat.home.pluto=/tomcat
-
+maven.tomcat.home=/tomcat
+maven.tomcat.version.major=4
1.7 +1 -1 jakarta-pluto/xdocs/install.xml
Index: install.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/xdocs/install.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- install.xml 29 Jan 2004 08:17:08 -0000 1.6
+++ install.xml 6 Feb 2004 07:57:09 -0000 1.7
@@ -15,7 +15,7 @@
</subsection>
<subsection name="Requirements">
<ul>
- <li><a href="http://maven.apache.org/start/download.html">Maven 1.0-beta-10</a>
+ <li><a href="http://maven.apache.org/start/download.html">Maven 1.0-RC1</a>
or higher</li>
<li>Java 1.3 or higher</li>
<li>Servlet 2.3:<br/>
1.7 +2 -2 jakarta-pluto/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/xdocs/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 4 Feb 2004 15:41:20 -0000 1.6
+++ navigation.xml 6 Feb 2004 07:57:09 -0000 1.7
@@ -15,14 +15,14 @@
<item name="FAQs" href="/faq.html"/>
<item name="Wiki" href="/wiki.html"/>
</menu>
-<!--
+
<menu name="Projects">
<item name="Portlet API (JSR-168)" href="/multiproject/portlet-api/index.html"/>
<item name="Portlet Container" href="/multiproject/pluto/index.html"/>
<item name="Jakarta Pluto Portal Driver" href="/multiproject/pluto-portal/index.html"/>
<item name="Pluto Portlet Test Suite" href="/multiproject/testsuite/index.html"/>
</menu>
--->
+
<menu name="Getting Started">
<item name="Installation" href="/install.html"/>
<item name="Architecture" href="/arch.html"/>
1.3 +108 -31 jakarta-pluto/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 29 Jan 2004 17:35:28 -0000 1.2
+++ maven.xml 6 Feb 2004 07:57:09 -0000 1.3
@@ -2,38 +2,115 @@
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
+
+ <!-- the war goal should always create pluto.war
+ with no version numbers. Why?-->
+ <preGoal name="war:init" >
+ <j:set var="maven.war.final.name" value="pluto.war"/>
+ </preGoal>
+
+ <preGoal name="war:install">
+ <attainGoal name="jar:install"/>
+ </preGoal>
+
+ <preGoal name="tomcat:deploy">
+ <j:set var="maven.war.final.name" value="pluto.war"/>
+ </preGoal>
+
+ <goal name="tomcat:init">
+ <j:set var="vers" value="${maven.tomcat.version.major}"/>
+ <j:if test="${vers==null}">
+ <ant:available property="maven.tomcat.version.major"
+ value="5"
+ type="file"
+ file="${maven.tomcat.home}/conf/Catalina/admin.xml"/>
+ </j:if>
+
+ <j:set var="vers" value="${maven.tomcat.version.major}"/>
+ <j:if test="${vers==null}">
+ <ant:available property="maven.tomcat.version.major"
+ value="5"
+ type="file"
+ file="${maven.tomcat.home}/webapps/admin.xml"/>
+ </j:if>
+
+ <j:set var="depl" value="${maven.tomcat.deploy}"/>
+ <j:if test="${depl != 'exploded'}">
+ <j:set var="maven.tomcat.deploy" value="war"/>
+ </j:if>
+
+ <echo>Deploying to Tomcat:
+ Location: ${maven.tomcat.home}
+ Major Version: ${maven.tomcat.version.major}
+ Hosts: ${maven.tomcat.host}
+ Context Config: ${maven.tomcat.context.config}
+ Deploy Type: ${maven.tomcat.deploy}
+
+ </echo>
+ </goal>
+
+ <goal name="tomcat:deploy">
+ <attainGoal name="tomcat:init"/>
+ <!-- ===================== -->
+ <!-- Deploy Dependencies -->
+ <!-- ===================== -->
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:if test="${dep.getProperty('tomcat.common')=='true'}">
+ <j:if test="${dep.type =='jar'}">
+ <j:if test="${dep.getProperty('tomcat.common.endorsed')!='true'}">
+ <ant:copy todir="${maven.tomcat.home}/common/lib" file="${lib.path}"/>
+ </j:if>
+ <j:if test="${dep.getProperty('tomcat.common.endorsed')=='true'}">
+ <ant:copy todir="${maven.tomcat.home}/common/endorsed" file="${lib.path}"/>
+ </j:if>
+ </j:if>
- <!-- the war goal should always create pluto.war with no version numbers -->
- <preGoal name="war:init" >
- <j:set var="maven.war.final.name" value="pluto.war"/>
- </preGoal>
- <!--
- - Deploys the pluto.jar and deps to the tomcat.home.pluto.
- - you should define tomcat.home in your $USER_HOME/build.properties file.
- -->
- <goal name="deployPlutoToTomcat">
- <attainGoal name="war" />
- <!-- Deploy endorsed jars -->
- <copy file="${maven.repo.local}/xerces/jars/xerces-2.3.0.jar" todir="${tomcat.home.pluto}/common/endorsed"/>
- <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-2.0.2.jar" todir="${tomcat.home.pluto}/common/endorsed"/>
-
- <!-- Deploy shared jars -->
- <copy file="${maven.repo.local}/portlet-api/jars/portlet-api-1.0.jar" todir="${tomcat.home.pluto}/shared/lib"/>
- <copy file="${maven.repo.local}/pluto/jars/pluto-1.0.jar" todir="${tomcat.home.pluto}/shared/lib"/>
-
- <!-- Remove old deployemnts -->
- <delete file="${tomcat.home.pluto}/webapps/${maven.war.final.name}" />
- <delete dir="${tomcat.home.pluto}/webapps/pluto" />
-
- <!-- copy the pluto.xml that sets up the pluto webapp's context -->
- <copy file="pluto.xml" todir="${tomcat.home.pluto}/webapps"/>
- <!-- *dirty* fix - copy pluto.xml additionally to conf/Catalina/localhost for Tomcat 5.x -->
- <copy file="pluto.xml" todir="${tomcat.home.pluto}/conf/Catalina/localhost"/>
+ <j:if test="${dep.type !='jar'}">
+ <ant:copy todir="${maven.tomcat.home}/common/classes" file="${lib.path}"/>
+ </j:if>
+ </j:if>
+
+ <j:if test="${dep.getProperty('tomcat.shared')=='true'}">
+ <j:if test="${dep.type =='jar'}">
+ <ant:copy todir="${maven.tomcat.home}/shared/lib" file="${lib.path}"/>
+ </j:if>
- <!-- Deploy the pluto.war -->
- <!-- <copy file="target/pluto.war" todir="${tomcat.home.pluto}/webapps"/> -->
- <unwar src="target/pluto.war" dest="${tomcat.home.pluto}/webapps/pluto"/>
- </goal>
-
+ <j:if test="${dep.type !='jar'}">
+ <ant:copy todir="${maven.tomcat.home}/shared/classes" file="${lib.path}"/>
+ </j:if>
+ </j:if>
+
+ </j:forEach>
+
+ <!-- ===================== -->
+ <!-- Deploy War -->
+ <!-- ===================== -->
+ <j:set var="depType" value="${maven.tomcat.deploy}"/>
+ <j:if test="${depType=='exploded'}">
+ <unwar src="target/${maven.war.final.name}" dest="${maven.tomcat.home}/webapps/pluto"/>
+ </j:if>
+ <j:if test="${depType=='war'}">
+ <copy file="target/${maven.war.final.name}"
+ todir="${maven.tomcat.home}/webapps"/>
+ </j:if>
+
+
+ <!-- ===================== -->
+ <!-- Deploy Context Config -->
+ <!-- ===================== -->
+ <j:set var="version" value="${maven.tomcat.version.major}"/>
+
+ <!-- If we are in Tomcat4.x-->
+ <j:if test="${version==4}">
+ <copy file="${maven.tomcat.context.config}"
+ todir="${maven.tomcat.home}/webapps"/>
+ </j:if>
+ <!-- If we are in Tomcat5.x-->
+ <j:if test="${version==5}">
+ <copy file="${maven.tomcat.context.config}"
+ todir="${maven.tomcat.home}/conf/Catalina/${maven.tomcat.host}"/>
+ </j:if>
+ </goal>
</project>
1.5 +22 -13 jakarta-pluto/portal/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 23 Jan 2004 08:18:00 -0000 1.4
+++ project.xml 6 Feb 2004 07:57:09 -0000 1.5
@@ -3,7 +3,7 @@
<project>
<extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
- <name>Jakarta Pluto Portal Driver</name>
+ <name>Pluto Portal Driver</name>
<id>pluto-portal</id>
<currentVersion>1.0</currentVersion>
@@ -25,67 +25,76 @@
<id>castor</id>
<version>0.9.5</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0.2</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
+
<dependency>
<id>pluto</id>
<groupId>pluto</groupId>
<version>1.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
+ <tomcat.shared>true</tomcat.shared>
</properties>
</dependency>
+
<dependency>
- <!--
- - portlet-api.jar must be located in your Maven repository under portlet-api/jars
- - This usually $USER_HOME/.maven/repository
- -->
<id>portlet-api</id>
<groupId>portlet-api</groupId>
<version>1.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
+ <tomcat.shared>true</tomcat.shared>
</properties>
</dependency>
+
<dependency>
<id>regexp</id>
<version>1.3-dev</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
+
<dependency>
<id>servletapi</id>
<version>2.3</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
+
<!--
- Both xerces and xmlApis should be located in
- your common/endorsed directory in Tomcat
- or the equivalent directory for your servlet container
+ -
-->
<dependency>
<id>xerces</id>
<version>2.3.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
+ <tomcat.common>true</tomcat.common>
+ <tomcat.common.endorsed>true</tomcat.common.endorsed>
</properties>
</dependency>
+
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
+ <tomcat.common>true</tomcat.common>
+ <tomcat.common.endorsed>true</tomcat.common.endorsed>
</properties>
</dependency>
1.2 +6 -2 jakarta-pluto/portal/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 9 Jan 2004 03:47:45 -0000 1.1
+++ project.properties 6 Feb 2004 07:57:09 -0000 1.2
@@ -10,6 +10,10 @@
maven.checkstyle.header.file = ${basedir}/../LICENSE.TXT
-maven.multiproject.type = war
+maven.multiproject.type=war
-maven.checkstyle.format = turbine
+maven.checkstyle.format=turbine
+
+maven.tomcat.host=localhost
+maven.tomcat.context.config=pluto.xml
+maven.tomcat.deploy=exploded
1.3 +7 -4 jakarta-pluto/testsuite/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/testsuite/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 8 Jan 2004 14:28:34 -0000 1.2
+++ maven.xml 6 Feb 2004 07:57:10 -0000 1.3
@@ -3,16 +3,19 @@
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
+ <!-- The multiproject won't let us call war directly, we must specify
+ since it won't be set by war goal. -->
+ <preGoal name="deployTestsuite">
+ <j:set var="maven.war.final.name" value="testsuite.war"/>
+ </preGoal>
<goal name="deployTestsuite">
- <delete dir="${tomcat.home.pluto}/webapps/testsuite" />
- <attainGoal name="war" />
<java classname="org.apache.pluto.portalImpl.Deploy" fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
<pathelement path="${maven.build.dest}"/>
</classpath>
- <arg value="${tomcat.home.pluto}/webapps" />
+ <arg value="${maven.tomcat.home}/webapps" />
<arg value="pluto" />
<arg value="${basedir}/target/${maven.war.final.name}" />
<arg value="../container/target" />
@@ -20,4 +23,4 @@
</goal>
-</project>
\ No newline at end of file
+</project>
1.4 +7 -11 jakarta-pluto/testsuite/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/testsuite/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 9 Jan 2004 04:03:21 -0000 1.3
+++ project.xml 6 Feb 2004 07:57:10 -0000 1.4
@@ -33,7 +33,7 @@
<id>castor</id>
<version>0.9.5</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -45,7 +45,7 @@
<id>pluto</id>
<version>1.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
@@ -53,27 +53,23 @@
<groupId>pluto</groupId>
<version>1.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
- <!--
- - portlet-api.jar must be located in your Maven repository under portlet-api/jars
- - This usually $USER_HOME/.maven/repository
- -->
<id>portlet-api</id>
<groupId>portlet-api</groupId>
<version>1.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
<id>servletapi</id>
<version>2.3</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
@@ -81,14 +77,14 @@
<id>xerces</id>
<version>2.3.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
1.5 +4 -7 jakarta-pluto/container/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 23 Jan 2004 08:18:00 -0000 1.4
+++ project.xml 6 Feb 2004 07:57:10 -0000 1.5
@@ -3,7 +3,7 @@
<project>
<extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
- <name>Portlet Container</name>
+ <name>Pluto Portlet Container</name>
<id>pluto</id>
<currentVersion>1.0</currentVersion>
@@ -27,15 +27,13 @@
</description>
<dependencies>
+
<dependency>
<id>regexp</id>
<version>1.3-dev</version>
</dependency>
+
<dependency>
- <!--
- - portlet-api.jar must be located in your Maven repository under portlet-api/jars
- - This usually $USER_HOME/.maven/repository
- -->
<id>portlet-api</id>
<groupId>portlet-api</groupId>
<version>1.0</version>
@@ -43,6 +41,7 @@
<war.bundle.jar>false</war.bundle.jar>
</properties>
</dependency>
+
<dependency>
<id>servletapi</id>
<version>2.3</version>
@@ -50,8 +49,6 @@
<war.bundle.jar>false</war.bundle.jar>
</properties>
</dependency>
-
-
</dependencies>
<build>
1.2 +1 -1 jakarta-pluto/container/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 7 Jan 2004 20:37:19 -0000 1.1
+++ maven.xml 6 Feb 2004 07:57:10 -0000 1.2
@@ -3,4 +3,4 @@
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
-</project>
\ No newline at end of file
+</project>
1.3 +7 -11 jakarta-pluto/deploy/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-pluto/deploy/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 23 Jan 2004 08:18:00 -0000 1.2
+++ project.xml 6 Feb 2004 07:57:10 -0000 1.3
@@ -21,7 +21,7 @@
<id>castor</id>
<version>0.9.5</version>
<properties>
- <war.bundle.jar>true</war.bundle.jar>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
@@ -33,7 +33,7 @@
<id>pluto</id>
<version>1.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
@@ -41,27 +41,23 @@
<groupId>pluto</groupId>
<version>1.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
- <!--
- - portlet-api.jar must be located in your Maven repository under portlet-api/jars
- - This usually $USER_HOME/.maven/repository
- -->
<id>portlet-api</id>
<groupId>portlet-api</groupId>
<version>1.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
<id>servletapi</id>
<version>2.3</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
@@ -69,14 +65,14 @@
<id>xerces</id>
<version>2.3.0</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
<dependency>
<id>xml-apis</id>
<version>2.0.2</version>
<properties>
- <war.bundle.jar>false</war.bundle.jar>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>