Author: rwatler
Date: Wed Jun 14 13:54:18 2006
New Revision: 414384
URL: http://svn.apache.org/viewvc?rev=414384&view=rev
Log:
M2 build update:
- support bluesunrise M2 repository for dependencies and maven plugins
- force older version of compiler plugin to support j2sdk 1.4.2
- refine xerces dependencies using xerces/xercesImpl artifacts
- update archetypes to escape use of ${basedir} in build files
now required with newer archetype plugin version that defines
basedir in the velocity context
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
portals/jetspeed-2/trunk/components/cm/pom.xml
portals/jetspeed-2/trunk/components/pom.xml
portals/jetspeed-2/trunk/components/portal/pom.xml
portals/jetspeed-2/trunk/components/rewriter/pom.xml
portals/jetspeed-2/trunk/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
portals/jetspeed-2/trunk/components/search/src/test/org/apache/jetspeed/search/TestSearch.java
portals/jetspeed-2/trunk/components/serializer/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/pom.xml
Modified: portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/pom.xml Wed Jun 14 13:54:18
2006
@@ -133,6 +133,16 @@
<artifactId>log4j</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml Wed Jun 14
13:54:18 2006
@@ -97,8 +97,13 @@
<!-- Runtime Dependencies -->
<dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
+ <artifactId>xercesImpl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/components/cm/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/pom.xml Wed Jun 14 13:54:18 2006
@@ -101,6 +101,16 @@
<artifactId>jta</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/pom.xml Wed Jun 14 13:54:18 2006
@@ -157,40 +157,43 @@
<configuration>
<systemProperties>
- <!-- Runtime Database Properties -->
+ <!-- Runtime and Test Database Properties -->
+ <!--
+ Bug: [MSUREFIRE-111] potentially empty
properties, (here
+ passwords), must be listed first as they may
default
+ incorrectly and pick up values from other
properties.
+ -->
<property>
- <name>org.apache.jetspeed.database.url</name>
-
<value>${org.apache.jetspeed.test.database.url}</value>
- </property>
- <property>
-
<name>org.apache.jetspeed.database.driver</name>
-
<value>${org.apache.jetspeed.test.database.driver}</value>
+
<name>org.apache.jetspeed.database.password</name>
+
<value>${org.apache.jetspeed.test.database.password}</value>
</property>
<property>
- <name>org.apache.jetspeed.database.user</name>
-
<value>${org.apache.jetspeed.test.database.user}</value>
+
<name>org.apache.jetspeed.test.database.password</name>
+
<value>${org.apache.jetspeed.test.database.password}</value>
</property>
<property>
-
<name>org.apache.jetspeed.database.password</name>
-
<value>${org.apache.jetspeed.test.database.password}</value>
+ <name>org.apache.jetspeed.database.url</name>
+
<value>${org.apache.jetspeed.test.database.url}</value>
</property>
-
- <!-- Test Database Properties -->
<property>
<name>org.apache.jetspeed.test.database.url</name>
<value>${org.apache.jetspeed.test.database.url}</value>
</property>
<property>
+
<name>org.apache.jetspeed.database.driver</name>
+
<value>${org.apache.jetspeed.test.database.driver}</value>
+ </property>
+ <property>
<name>org.apache.jetspeed.test.database.driver</name>
<value>${org.apache.jetspeed.test.database.driver}</value>
</property>
<property>
-
<name>org.apache.jetspeed.test.database.user</name>
+ <name>org.apache.jetspeed.database.user</name>
<value>${org.apache.jetspeed.test.database.user}</value>
</property>
<property>
-
<name>org.apache.jetspeed.test.database.password</name>
-
<value>${org.apache.jetspeed.test.database.password}</value>
+
<name>org.apache.jetspeed.test.database.user</name>
+
<value>${org.apache.jetspeed.test.database.user}</value>
</property>
</systemProperties>
Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Wed Jun 14 13:54:18 2006
@@ -170,6 +170,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-webapp-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>
Modified: portals/jetspeed-2/trunk/components/rewriter/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/pom.xml Wed Jun 14 13:54:18
2006
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
+ <artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>nekohtml</groupId>
Modified:
portals/jetspeed-2/trunk/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java
Wed Jun 14 13:54:18 2006
@@ -69,11 +69,6 @@
{
//assume it's full path for now
rootIndexDir = new File(indexRoot);
- if(!rootIndexDir.exists())
- {
- rootIndexDir.mkdirs();
- }
-
this.analyzerClassName = analyzerClassName;
this.optimizeAfterUpdate = optimzeAfterUpdate;
this.handlerFactory = handlerFactory;
@@ -86,7 +81,10 @@
}
catch (Exception e)
{
- log.error("Failed to create Portal Registry indexes in " +
rootIndexDir.getPath(), e);
+ if (rootIndexDir.exists())
+ {
+ log.error("Failed to open Portal Registry indexes in " +
rootIndexDir.getPath(), e);
+ }
try
{
rootIndexDir.delete();
@@ -100,7 +98,7 @@
catch (Exception e1)
{
String message = "Cannot RECREATE Portlet Registry indexes in
" + rootIndexDir.getPath();
- log.error(message, e);
+ log.error(message, e1);
throw new Exception(message);
}
}
Modified:
portals/jetspeed-2/trunk/components/search/src/test/org/apache/jetspeed/search/TestSearch.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/search/src/test/org/apache/jetspeed/search/TestSearch.java?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/search/src/test/org/apache/jetspeed/search/TestSearch.java
(original)
+++
portals/jetspeed-2/trunk/components/search/src/test/org/apache/jetspeed/search/TestSearch.java
Wed Jun 14 13:54:18 2006
@@ -38,7 +38,7 @@
public class TestSearch extends TestCase
{
- private final static String INDEX_DIRECTORY = "./search_index";
+ private final static String INDEX_DIRECTORY = "./target/search_index";
private File indexRoot;
SearchEngine searchEngine;
Modified: portals/jetspeed-2/trunk/components/serializer/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/pom.xml Wed Jun 14 13:54:18
2006
@@ -62,6 +62,18 @@
<artifactId>xstream</artifactId>
</dependency>
+ <!-- Runtime Dependencies -->
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
<!-- Build Configuration -->
Modified:
portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
Wed Jun 14 13:54:18 2006
@@ -135,7 +135,7 @@
<phase>install</phase>
<configuration>
<tasks>
- <ant target="hot-deploy-war"
antfile="build.xml" dir="${basedir}/../../app-servers" inheritall="off">
+ <ant target="hot-deploy-war"
antfile="build.xml" dir="\${basedir}/../../app-servers" inheritall="off">
<property
name="org.apache.jetspeed.deploy.enable"
value="${org.apache.jetspeed.env.hotdeploy}"/>
<property
name="org.apache.jetspeed.deploy.target"
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
Wed Jun 14 13:54:18 2006
@@ -93,7 +93,7 @@
<phase>install</phase>
<configuration>
<tasks>
- <ant target="hot-deploy-jar"
antfile="build.xml" dir="${basedir}/../../app-servers" inheritall="off">
+ <ant target="hot-deploy-jar"
antfile="build.xml" dir="\${basedir}/../../app-servers" inheritall="off">
<property
name="org.apache.jetspeed.deploy.enable"
value="${org.apache.jetspeed.env.hotdeploy}"/>
<property
name="org.apache.jetspeed.deploy.target"
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
Wed Jun 14 13:54:18 2006
@@ -123,7 +123,7 @@
<not>
<or>
<equals arg1="${org.apache.jetspeed.deploy.target}"
arg2="none"/>
- <available
file="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"/>
+ <available
file="\${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"/>
</or>
</not>
</condition>
@@ -142,7 +142,7 @@
</target>
<target name="invoke-deploy" unless="org.apache.jetspeed.unsupported">
- <ant
antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="deploy" inheritall="off">
+ <ant
antfile="\${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="deploy" inheritall="off">
<property name="org.apache.jetspeed.server.home"
value="${org.apache.jetspeed.server.home}"/>
<property name="org.apache.jetspeed.catalina.version.major"
@@ -181,7 +181,7 @@
</target>
<target name="invoke-hot-deploy" unless="org.apache.jetspeed.unsupported">
- <ant
antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="hot-deploy" inheritall="off">
+ <ant
antfile="\${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="hot-deploy" inheritall="off">
<property name="org.apache.jetspeed.server.home"
value="${org.apache.jetspeed.server.home}"/>
<property name="org.apache.jetspeed.groupid"
@@ -202,7 +202,7 @@
</target>
<target name="invoke-hot-deploy-shared-jar"
unless="org.apache.jetspeed.unsupported">
- <ant
antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="hot-deploy-shared-jar" inheritall="off">
+ <ant
antfile="\${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="hot-deploy-shared-jar" inheritall="off">
<property name="org.apache.jetspeed.deploy.groupid"
value="${org.apache.jetspeed.deploy.groupid}"/>
<property name="org.apache.jetspeed.deploy.artifactid"
@@ -213,7 +213,7 @@
</target>
<target name="invoke-hot-deploy-jar"
unless="org.apache.jetspeed.unsupported">
- <ant
antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="hot-deploy-jar" inheritall="off">
+ <ant
antfile="\${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="hot-deploy-jar" inheritall="off">
<property name="org.apache.jetspeed.deploy.groupid"
value="${org.apache.jetspeed.deploy.groupid}"/>
<property name="org.apache.jetspeed.deploy.artifactid"
@@ -224,7 +224,7 @@
</target>
<target name="invoke-hot-deploy-war"
unless="org.apache.jetspeed.unsupported">
- <ant
antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="hot-deploy-war" inheritall="off">
+ <ant
antfile="\${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"
dir="${basedir}" target="hot-deploy-war" inheritall="off">
<property name="org.apache.jetspeed.deploy.groupid"
value="${org.apache.jetspeed.deploy.groupid}"/>
<property name="org.apache.jetspeed.deploy.artifactid"
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
Wed Jun 14 13:54:18 2006
@@ -56,7 +56,7 @@
<tasks>
<!-- normal deployment to app server -->
- <ant target="deploy" antfile="build.xml"
dir="${basedir}" inheritall="off">
+ <ant target="deploy" antfile="build.xml"
dir="\${basedir}" inheritall="off">
<property
name="org.apache.jetspeed.deploy.skip"
value="${org.apache.jetspeed.env.hotdeploy}"/>
<property
name="org.apache.jetspeed.deploy.target"
@@ -98,7 +98,7 @@
</ant>
<!-- hot deployment to app server -->
- <ant target="hot-deploy" antfile="build.xml"
dir="${basedir}" inheritall="off">
+ <ant target="hot-deploy" antfile="build.xml"
dir="\${basedir}" inheritall="off">
<property
name="org.apache.jetspeed.deploy.enable"
value="${org.apache.jetspeed.env.hotdeploy}"/>
<property
name="org.apache.jetspeed.deploy.target"
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
Wed Jun 14 13:54:18 2006
@@ -113,7 +113,7 @@
<!-- generate and deploy portal application context file -->
<delete
file="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/${artifactId}.xml"/>
<copy
todir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
- <fileset dir="${basedir}/../etc/conf/tomcat">
+ <fileset dir="\${basedir}/../etc/conf/tomcat">
<include name="jetspeed-tomcat-5.xml"
unless="org.apache.jetspeed.tomcat.5.5"/>
<include name="jetspeed-tomcat-5.5.xml"
if="org.apache.jetspeed.tomcat.5.5"/>
</fileset>
@@ -142,12 +142,12 @@
<!-- hot deploy content -->
<copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}">
- <fileset dir="${basedir}/../portal/src/webapp">
+ <fileset dir="\${basedir}/../portal/src/webapp">
<exclude name="WEB-INF/**"/>
<exclude name="decorations/**"/>
<exclude name="readme.txt"/>
</fileset>
- <fileset dir="${basedir}/../etc/webapp">
+ <fileset dir="\${basedir}/../etc/webapp">
<exclude name="WEB-INF/**"/>
<exclude name="decorations/**"/>
<exclude name="readme.txt"/>
@@ -156,10 +156,10 @@
<!-- hot deploy templates content -->
<copy
todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/templates">
- <fileset dir="${basedir}/../portal/src/webapp/WEB-INF/templates">
+ <fileset dir="\${basedir}/../portal/src/webapp/WEB-INF/templates">
<exclude name="readme.txt"/>
</fileset>
- <fileset dir="${basedir}/../etc/templates">
+ <fileset dir="\${basedir}/../etc/templates">
<exclude name="readme.txt"/>
</fileset>
</copy>
@@ -172,20 +172,20 @@
<!-- hot deploy pages content -->
<copy
todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/pages">
- <fileset dir="${basedir}/../portal/src/webapp/WEB-INF/pages">
+ <fileset dir="\${basedir}/../portal/src/webapp/WEB-INF/pages">
<exclude name="readme.txt"/>
</fileset>
- <fileset dir="${basedir}/../etc/pages">
+ <fileset dir="\${basedir}/../etc/pages">
<exclude name="readme.txt"/>
</fileset>
</copy>
<!-- hot deploy decorations content -->
<copy
todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/decorations">
- <fileset dir="${basedir}/../portal/src/webapp/decorations">
+ <fileset dir="\${basedir}/../portal/src/webapp/decorations">
<exclude name="readme.txt"/>
</fileset>
- <fileset dir="${basedir}/../etc/decorations">
+ <fileset dir="\${basedir}/../etc/decorations">
<exclude name="readme.txt"/>
</fileset>
</copy>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
Wed Jun 14 13:54:18 2006
@@ -32,16 +32,16 @@
<property name="ant.version" value=""/>
<property name="hsqldb.version" value=""/>
- <property name="org.apache.jetspeed.source.sql" value="${basedir}/sql"/>
+ <property name="org.apache.jetspeed.source.sql" value="\${basedir}/sql"/>
<property name="org.apache.jetspeed.database.source.sql"
value="${org.apache.jetspeed.source.sql}/${org.apache.jetspeed.database.default.name}"/>
- <property name="org.apache.jetspeed.database.target.sql.root"
value="${basedir}/target/sql"/>
+ <property name="org.apache.jetspeed.database.target.sql.root"
value="\${basedir}/target/sql"/>
<property name="org.apache.jetspeed.database.target.sql"
value="${org.apache.jetspeed.database.target.sql.root}/${org.apache.jetspeed.database.default.name}"/>
<property name="torque.contextProperties" value=""/>
<property name="torque.runOnlyOnSchemaChange" value="true"/>
<property name="torque.idTableXMLFile" value=""/>
<property name="torque.project" value="phase1"/>
- <property name="torque.schema.dir" value="${basedir}/schema"/>
+ <property name="torque.schema.dir" value="\${basedir}/schema"/>
<property name="torque.schema.sql.excludes" value=""/>
<property name="torque.schema.sql.includes" value="*-schema.xml"/>
<property name="torque.template.sql" value="sql/base/Control.vm"/>
@@ -355,7 +355,7 @@
the subsequent test database access in forked JVMs.
-->
<!-- write out temporary ant build file for forked execution -->
- <echo file="${basedir}/derby-sql-build.xml">
+ <echo file="\${basedir}/derby-sql-build.xml">
<project name="etc-derby-sql-build">
<target name="forked-sql-execute-derby">
<sql
url="${org.apache.jetspeed.database.url};create=true"
driver="${org.apache.jetspeed.database.driver}"
@@ -383,15 +383,15 @@
version="${ant.version}"/>
</dependencies>
<!-- fork and execute temporary ant build file -->
- <java classname="org.apache.tools.ant.Main" fork="on" append="on"
failonerror="on" dir="${basedir}">
+ <java classname="org.apache.tools.ant.Main" fork="on" append="on"
failonerror="on" dir="\${basedir}">
<classpath>
<fileset refid="ant.dependencies.id"/>
<fileset refid="derby.embedded.db.dependencies.id"/>
</classpath>
- <arg line="-f ${basedir}/derby-sql-build.xml
forked-sql-execute-derby"/>
+ <arg line="-f \${basedir}/derby-sql-build.xml
forked-sql-execute-derby"/>
</java>
<!-- cleanup temporary ant build file -->
- <delete file="${basedir}/derby-sql-build.xml"/>
+ <delete file="\${basedir}/derby-sql-build.xml"/>
</target>
<target name="sql-execute-hsql"
if="org.apache.jetspeed.database.is.hsql.embedded">
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
Wed Jun 14 13:54:18 2006
@@ -82,8 +82,8 @@
<phase>compile</phase>
<configuration>
<tasks>
- <ant target="clean-schema" antfile="build.xml"
dir="${basedir}" inheritall="off"/>
- <ant target="schema" antfile="build.xml"
dir="${basedir}" inheritall="off">
+ <ant target="clean-schema" antfile="build.xml"
dir="\${basedir}" inheritall="off"/>
+ <ant target="schema" antfile="build.xml"
dir="\${basedir}" inheritall="off">
<property
name="org.apache.jetspeed.database.default.name"
value="${org.apache.jetspeed.production.database.default.name}"/>
</ant>
@@ -100,7 +100,7 @@
<phase>install</phase>
<configuration>
<tasks>
- <ant target="populate-db-userinfo"
antfile="build.xml" dir="${basedir}" inheritRefs="on">
+ <ant target="populate-db-userinfo"
antfile="build.xml" dir="\${basedir}" inheritRefs="on">
<property
name="org.apache.jetspeed.database.enable"
value="${org.apache.jetspeed.env.deploy.db}"/>
<property
name="org.apache.jetspeed.database.skip"
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
Wed Jun 14 13:54:18 2006
@@ -94,6 +94,17 @@
<ant.version>1.6.5</ant.version>
<junit.version>3.8.1</junit.version>
<org.apache.maven.artifact.ant.version>2.0.4</org.apache.maven.artifact.ant.version>
+ <!--
+ Bug: [MCOMPILER-36] using specific version of compiler
+ plugin to avoid compilation issues with j2sdk 1.4.2
+ involving compilation of sources on classpath.
+ -->
+
<org.apache.maven.plugins.maven-compiler-plugin.version>2.0</org.apache.maven.plugins.maven-compiler-plugin.version>
+ <!--
+ Bug: using specific version of surefire plugin
+ to ensure test isolation for spring test cases;
+ specifically connection datasource management.
+ -->
<org.apache.maven.plugins.maven-surefire-plugin.version>2.1.3</org.apache.maven.plugins.maven-surefire-plugin.version>
<torque.version>3.2-rc3</torque.version>
@@ -143,16 +154,16 @@
<repositories>
<repository>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- <repository>
<id>com.bluesunrise.m2</id>
<name>Maven2 BlueSunrise</name>
<url>http://www.bluesunrise.com/maven2</url>
</repository>
<repository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ <repository>
<id>com.bluesunrise.m1</id>
<name>Maven1 BlueSunrise</name>
<url>http://www.bluesunrise.com/maven</url>
@@ -171,6 +182,18 @@
<layout>legacy</layout>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>com.bluesunrise.m2</id>
+ <name>Maven2 BlueSunrise</name>
+ <url>http://www.bluesunrise.com/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
<!-- Dependency Configuration -->
@@ -527,6 +550,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+
<version>${org.apache.maven.plugins.maven-compiler-plugin.version}</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
Wed Jun 14 13:54:18 2006
@@ -62,27 +62,27 @@
new version of the archetype plugin is developed and released.
-->
<!-- Assemble required portal webapp resources -->
- <delete dir="${basedir}/target/webapp"/>
- <mkdir dir="${basedir}/target/webapp"/>
+ <delete dir="\${basedir}/target/webapp"/>
+ <mkdir dir="\${basedir}/target/webapp"/>
<dependencies filesetId="portal.resources.dependencies.id"
useScope="runtime">
<dependency groupId="${org.apache.jetspeed.groupid}"
artifactId="portal-archetype-resources"
version="${org.apache.jetspeed.version}"/>
</dependencies>
- <copy todir="${basedir}/target" flatten="on">
+ <copy todir="\${basedir}/target" flatten="on">
<fileset refid="portal.resources.dependencies.id"/>
</copy>
- <unjar
src="${basedir}/target/portal-archetype-resources-${org.apache.jetspeed.version}.jar"
- dest="${basedir}/target/webapp">
+ <unjar
src="\${basedir}/target/portal-archetype-resources-${org.apache.jetspeed.version}.jar"
+ dest="\${basedir}/target/webapp">
<patternset>
<exclude name="META-INF/**"/>
</patternset>
</unjar>
- <delete
file="${basedir}/target/portal-archetype-resources-${org.apache.jetspeed.version}.jar"/>
+ <delete
file="\${basedir}/target/portal-archetype-resources-${org.apache.jetspeed.version}.jar"/>
<!-- Merge webapp resource overrides from src -->
- <copy todir="${basedir}/target/webapp" overwrite="on">
- <fileset dir="${basedir}/src/webapp">
+ <copy todir="\${basedir}/target/webapp" overwrite="on">
+ <fileset dir="\${basedir}/src/webapp">
<exclude name="WEB-INF/assembly/readme.txt"/>
<exclude name="WEB-INF/conf/readme.txt"/>
<exclude name="WEB-INF/pages/readme.txt"/>
@@ -93,36 +93,36 @@
</copy>
<!-- Merge webapp resource overrides from etc -->
- <copy todir="${basedir}/target/webapp" overwrite="on">
- <fileset dir="${basedir}/../etc/webapp">
+ <copy todir="\${basedir}/target/webapp" overwrite="on">
+ <fileset dir="\${basedir}/../etc/webapp">
<exclude name="WEB-INF/**"/>
<exclude name="decorations/**"/>
<exclude name="readme.txt"/>
</fileset>
</copy>
- <copy todir="${basedir}/target/webapp/WEB-INF/assembly" overwrite="on">
- <fileset dir="${basedir}/../etc/assembly">
+ <copy todir="\${basedir}/target/webapp/WEB-INF/assembly"
overwrite="on">
+ <fileset dir="\${basedir}/../etc/assembly">
<exclude name="readme.txt"/>
</fileset>
</copy>
- <copy todir="${basedir}/target/webapp/WEB-INF/pages" overwrite="on">
- <fileset dir="${basedir}/../etc/pages">
+ <copy todir="\${basedir}/target/webapp/WEB-INF/pages" overwrite="on">
+ <fileset dir="\${basedir}/../etc/pages">
<exclude name="readme.txt"/>
</fileset>
</copy>
- <copy todir="${basedir}/target/webapp/WEB-INF/templates"
overwrite="on">
- <fileset dir="${basedir}/../etc/templates">
+ <copy todir="\${basedir}/target/webapp/WEB-INF/templates"
overwrite="on">
+ <fileset dir="\${basedir}/../etc/templates">
<exclude name="readme.txt"/>
</fileset>
</copy>
- <copy todir="${basedir}/target/webapp/decorations" overwrite="on">
- <fileset dir="${basedir}/../etc/decorations">
+ <copy todir="\${basedir}/target/webapp/decorations" overwrite="on">
+ <fileset dir="\${basedir}/../etc/decorations">
<exclude name="readme.txt"/>
</fileset>
</copy>
<!-- Configure runtime portal properties resource -->
- <replace
file="${basedir}/target/webapp/WEB-INF/conf/jetspeed.properties">
+ <replace
file="\${basedir}/target/webapp/WEB-INF/conf/jetspeed.properties">
<replacefilter token="@AUTODEPLOYMENT_SERVER@"
value="${org.apache.jetspeed.services.autodeployment.server}"/>
<replacefilter token="@AUTODEPLOYMENT_USER@"
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
Wed Jun 14 13:54:18 2006
@@ -70,7 +70,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
- <ant target="configure" antfile="build.xml"
dir="${basedir}" inheritall="off">
+ <ant target="configure" antfile="build.xml"
dir="\${basedir}" inheritall="off">
<property
name="org.apache.jetspeed.catalina.version.major"
value="${org.apache.jetspeed.catalina.version.major}"/>
<property
name="org.apache.jetspeed.services.autodeployment.server"
Modified:
portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
Wed Jun 14 13:54:18 2006
@@ -91,7 +91,7 @@
<phase>install</phase>
<configuration>
<tasks>
- <ant target="hot-deploy-shared-jar"
antfile="build.xml" dir="${basedir}/../../app-servers" inheritall="off">
+ <ant target="hot-deploy-shared-jar"
antfile="build.xml" dir="\${basedir}/../../app-servers" inheritall="off">
<property
name="org.apache.jetspeed.deploy.enable"
value="${org.apache.jetspeed.env.hotdeploy}"/>
<property
name="org.apache.jetspeed.deploy.target"
Modified: portals/jetspeed-2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?rev=414384&r1=414383&r2=414384&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Wed Jun 14 13:54:18 2006
@@ -135,6 +135,17 @@
<junit.version>3.8.1</junit.version>
<mockrunner.version>0.2.7</mockrunner.version>
<org.apache.maven.artifact.ant.version>2.0.4</org.apache.maven.artifact.ant.version>
+ <!--
+ Bug: [MCOMPILER-36] using specific version of compiler
+ plugin to avoid compilation issues with j2sdk 1.4.2
+ involving compilation of sources on classpath.
+ -->
+
<org.apache.maven.plugins.maven-compiler-plugin.version>2.0</org.apache.maven.plugins.maven-compiler-plugin.version>
+ <!--
+ Bug: using specific version of surefire plugin
+ to ensure test isolation for spring test cases;
+ specifically connection datasource management.
+ -->
<org.apache.maven.plugins.maven-surefire-plugin.version>2.1.3</org.apache.maven.plugins.maven-surefire-plugin.version>
<torque.version>3.2-rc3</torque.version>
<tyrex.version>1.0.1</tyrex.version>
@@ -239,16 +250,16 @@
<repositories>
<repository>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- <repository>
<id>com.bluesunrise.m2</id>
<name>Maven2 BlueSunrise</name>
<url>http://www.bluesunrise.com/maven2</url>
</repository>
<repository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ <repository>
<id>com.bluesunrise.m1</id>
<name>Maven1 BlueSunrise</name>
<url>http://www.bluesunrise.com/maven</url>
@@ -267,7 +278,25 @@
<layout>legacy</layout>
</repository>
</repositories>
-
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <id>com.bluesunrise.m2</id>
+ <name>Maven2 BlueSunrise Plugin</name>
+ <url>http://www.bluesunrise.com/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <id>central</id>
+ <name>Maven Plugin Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<!-- Dependency Configuration -->
<dependencyManagement>
@@ -575,23 +604,11 @@
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>${commons-pool.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${commons-dbcp.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
@@ -649,7 +666,7 @@
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
+ <artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
</dependency>
<dependency>
@@ -915,6 +932,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+
<version>${org.apache.maven.plugins.maven-compiler-plugin.version}</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
