You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/12/01 04:51:55 UTC
svn commit: r1040871 - in /geronimo/daytrader/trunk:
assemblies/javaee/daytrader-war/ assemblies/javaee/dojo-ui-war/
assemblies/web/daytrader-web-jdbc/ assemblies/web/daytrader-web-jpa/
assemblies/webprofile/daytrader-webprofile-war/ modules/json-proxy...
Author: xiaming
Date: Wed Dec 1 03:51:55 2010
New Revision: 1040871
URL: http://svn.apache.org/viewvc?rev=1040871&view=rev
Log:
Fix build errors: jstl dependency missing and war resource error
Modified:
geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml
geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml
geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml
geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml
geronimo/daytrader/trunk/modules/json-proxy/pom.xml
geronimo/daytrader/trunk/modules/web/pom.xml
Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml?rev=1040871&r1=1040870&r2=1040871&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml Wed Dec 1 03:51:55 2010
@@ -110,10 +110,11 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <scope>provided</scope>
</dependency>
+
<!-- Removed per DAYTRADER-7 due to interop issues on commercial AppServers
<dependency>
<groupId>org.codehaus.mojo</groupId>
@@ -123,19 +124,7 @@
</dependency>
-->
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>
- ${basedir}/src/main/resources
- </directory>
- <targetPath>${project.build.directory}/${project.artifactId}-${project.version}/docs</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>**/tradeversion.html</include>
- </includes>
- </resource>
- </resources>
+ <build>
<plugins>
<!-- Removed per DATRADER-7 due to interop issues on commercial AppServers
<plugin>
@@ -183,6 +172,16 @@
<include>META-INF/DISCLAIMER*</include>
</includes>
</resource>
+ <resource>
+ <directory>
+ ${basedir}/src/main/resources
+ </directory>
+ <targetPath>docs</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/tradeversion.html</include>
+ </includes>
+ </resource>
</webResources>
</configuration>
</plugin>
Modified: geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml?rev=1040871&r1=1040870&r2=1040871&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-war/pom.xml Wed Dec 1 03:51:55 2010
@@ -43,10 +43,11 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <scope>provided</scope>
</dependency>
+
</dependencies>
<build>
<plugins>
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml?rev=1040871&r1=1040870&r2=1040871&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml Wed Dec 1 03:51:55 2010
@@ -69,11 +69,12 @@
<artifactId>geronimo-jsp_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml?rev=1040871&r1=1040870&r2=1040871&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jpa/pom.xml Wed Dec 1 03:51:55 2010
@@ -79,10 +79,11 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <scope>provided</scope>
</dependency>
+
<!-- user or app server provided artifacts -->
<dependency>
<groupId>org.apache.openjpa</groupId>
Modified: geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml?rev=1040871&r1=1040870&r2=1040871&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/webprofile/daytrader-webprofile-war/pom.xml Wed Dec 1 03:51:55 2010
@@ -109,11 +109,12 @@
<artifactId>geronimo-jsp_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
<plugins>
Modified: geronimo/daytrader/trunk/modules/json-proxy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/json-proxy/pom.xml?rev=1040871&r1=1040870&r2=1040871&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/json-proxy/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/json-proxy/pom.xml Wed Dec 1 03:51:55 2010
@@ -53,10 +53,11 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <scope>provided</scope>
</dependency>
+
</dependencies>
<build>
Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?rev=1040871&r1=1040870&r2=1040871&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Wed Dec 1 03:51:55 2010
@@ -97,10 +97,11 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ <scope>provided</scope>
</dependency>
+
<!-- Removed per DAYTRADER-7 due to interop issues on commercial AppServers
<dependency>
<groupId>org.codehaus.mojo</groupId>