You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by es...@apache.org on 2007/08/22 07:10:02 UTC
svn commit: r568420 - in /portals/wsrp4j/trunk/consumer-proxyportlet:
pom.xml src/java/ src/main/ src/main/java/ src/main/resources/
src/main/webapp/ src/resources/ src/webapp/
Author: esm
Date: Tue Aug 21 22:10:01 2007
New Revision: 568420
URL: http://svn.apache.org/viewvc?rev=568420&view=rev
Log:
Updating consumer-proxyportlet project structure to follow Maven 2 conventions.
* Moved consumer-proxyportlet/src/java to consumer-proxyportlet/src/main/java
* Moved consumer-proxyportlet/src/resource to consumer-proxyportlet/src/main/resources
* Moved consumer-proxyportlet/src/webapp to consumer-proxyportlet/src/main/webapp
Updated project dependencies
* Added dep on commons-lang
* Added optional dep on hibernate persistence
* Updated war deps jstl and taglibs to runtime scope
Updated proxy portlet war packaging to use Pluto 1.1 web.xml.
Added:
portals/wsrp4j/trunk/consumer-proxyportlet/src/main/
portals/wsrp4j/trunk/consumer-proxyportlet/src/main/java/
- copied from r567220, portals/wsrp4j/trunk/consumer-proxyportlet/src/java/
portals/wsrp4j/trunk/consumer-proxyportlet/src/main/resources/
- copied from r567220, portals/wsrp4j/trunk/consumer-proxyportlet/src/resources/
portals/wsrp4j/trunk/consumer-proxyportlet/src/main/webapp/
- copied from r568404, portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/
Removed:
portals/wsrp4j/trunk/consumer-proxyportlet/src/java/
portals/wsrp4j/trunk/consumer-proxyportlet/src/resources/
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/
Modified:
portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml?rev=568420&r1=568419&r2=568420&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml Tue Aug 21 22:10:01 2007
@@ -38,12 +38,12 @@
</description>
<build>
-
- <sourceDirectory>src/java</sourceDirectory>
+
+ <finalName>${pom.artifactId}</finalName>
<resources>
<resource>
- <directory>${basedir}/src/resources</directory>
+ <directory>src/main/resources</directory>
<targetPath>org/apache/wsrp4j/consumer/configportlet/messages</targetPath>
<includes>
<include>Messages.properties</include>
@@ -52,25 +52,45 @@
</resources>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0</version>
<configuration>
- <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
- <warName>${pom.artifactId}</warName>
- <webResources>
+ <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ <webResources>
<resource>
- <directory>${basedir}/src/webapp</directory>
+ <directory>${basedir}/src/main/webapp</directory>
<filtering>true</filtering>
<includes>
- <include>WEB-INF/classes/log4j.properties</include>
<include>WEB-INF/classes/wsrp4j-config.properties</include>
</includes>
</resource>
</webResources>
</configuration>
- </plugin>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <version>1.1.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-util</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
@@ -92,15 +112,17 @@
</dependency>
<dependency>
- <artifactId>jstl</artifactId>
- <groupId>javax.servlet</groupId>
- <version>${jstl.version}</version>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ <version>${commons-lang.version}</version>
</dependency>
+ <!-- FIXME: org/apache/wsrp4j/consumer/configportlet/controller/ProducerRegistryConfigPortlet
+ directly depends on Sun's impl -->
<dependency>
- <artifactId>standard</artifactId>
- <groupId>taglibs</groupId>
- <version>${jstl.version}</version>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ <version>${javax-mail.version}</version>
</dependency>
<dependency>
@@ -115,19 +137,36 @@
</exclusions>
</dependency>
- <!-- Runtime dependencies ================================= -->
+ <!-- Runtime dependencies ================================= -->
+ <!-- At least one persistence mechanism is required -->
<dependency>
<artifactId>wsrp4j-persistence-db</artifactId>
<groupId>org.apache.wsrp4j</groupId>
<version>${pom.version}</version>
<scope>runtime</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<artifactId>wsrp4j-persistence-xml</artifactId>
<groupId>org.apache.wsrp4j</groupId>
<version>${pom.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Webapp requires JSTL and standard -->
+ <dependency>
+ <artifactId>standard</artifactId>
+ <groupId>taglibs</groupId>
+ <version>${jstl.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <artifactId>jstl</artifactId>
+ <groupId>javax.servlet</groupId>
+ <version>${jstl.version}</version>
<scope>runtime</scope>
</dependency>