You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2006/02/08 16:17:47 UTC
svn commit: r375977 - in /portals/jetspeed-2/trunk: ./ commons/ components/
components/capability/ components/cm/ components/deploy-tool/
components/file-cache/ components/header-resource/ components/id-generator/
components/jetspeed/ components/locato...
Author: rwatler
Date: Wed Feb 8 07:17:42 2006
New Revision: 375977
URL: http://svn.apache.org/viewcvs?rev=375977&view=rev
Log:
update maven2 deps
Added:
portals/jetspeed-2/trunk/components/pom.xml (with props)
Modified:
portals/jetspeed-2/trunk/commons/pom.xml
portals/jetspeed-2/trunk/components/capability/pom.xml
portals/jetspeed-2/trunk/components/cm/pom.xml
portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
portals/jetspeed-2/trunk/components/file-cache/pom.xml
portals/jetspeed-2/trunk/components/header-resource/pom.xml
portals/jetspeed-2/trunk/components/id-generator/pom.xml
portals/jetspeed-2/trunk/components/jetspeed/pom.xml
portals/jetspeed-2/trunk/components/locator/pom.xml
portals/jetspeed-2/trunk/components/page-manager/pom.xml
portals/jetspeed-2/trunk/components/portal-site/pom.xml
portals/jetspeed-2/trunk/components/portal/pom.xml
portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
portals/jetspeed-2/trunk/components/prefs/pom.xml
portals/jetspeed-2/trunk/components/profiler/pom.xml
portals/jetspeed-2/trunk/components/rdbms/pom.xml
portals/jetspeed-2/trunk/components/registry/pom.xml
portals/jetspeed-2/trunk/components/rewriter/pom.xml
portals/jetspeed-2/trunk/components/search/pom.xml
portals/jetspeed-2/trunk/components/security-schema/pom.xml
portals/jetspeed-2/trunk/components/security/pom.xml
portals/jetspeed-2/trunk/components/serializer/pom.xml
portals/jetspeed-2/trunk/components/sso/pom.xml
portals/jetspeed-2/trunk/components/statistics/pom.xml
portals/jetspeed-2/trunk/components/web-content/pom.xml
portals/jetspeed-2/trunk/content-server/pom.xml
portals/jetspeed-2/trunk/jetspeed-api/pom.xml
portals/jetspeed-2/trunk/pom.xml
Modified: portals/jetspeed-2/trunk/commons/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/commons/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/commons/pom.xml (original)
+++ portals/jetspeed-2/trunk/commons/pom.xml Wed Feb 8 07:17:42 2006
@@ -48,10 +48,6 @@
<groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-common</artifactId>
- </dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/components/capability/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/capability/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Capability Components</name>
@@ -48,19 +48,7 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-registry</artifactId>
+ <artifactId>jetspeed-rdbms</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/trunk/components/cm/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Component Manager</name>
@@ -45,10 +45,6 @@
<!-- Build Dependencies -->
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
<groupId>springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
@@ -67,6 +63,18 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ </dependency>
+ <!--
+ Note: junit is normally required only for test, but
+ in this case, abstract test cases are included in the
+ component build... this should probably be fixed...
+ for now, assume that junit will be provided if these
+ test classes are used.
+ -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Deploy Tools</name>
@@ -44,10 +44,6 @@
<dependencies>
<!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
Modified: portals/jetspeed-2/trunk/components/file-cache/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/file-cache/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 File Cache</name>
@@ -44,14 +44,6 @@
<dependencies>
<!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: portals/jetspeed-2/trunk/components/header-resource/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/header-resource/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,30 +30,14 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Header Resource Management</name>
<description>
Jetspeed Header Resource Management
</description>
-
- <!-- Dependencies -->
-
- <dependencies>
-
- <!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
-
- </dependencies>
<!-- Project Information -->
Modified: portals/jetspeed-2/trunk/components/id-generator/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/id-generator/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 ID Generator</name>
@@ -44,14 +44,6 @@
<dependencies>
<!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: portals/jetspeed-2/trunk/components/jetspeed/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/jetspeed/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Components</name>
@@ -45,8 +45,12 @@
<!-- Build Dependencies -->
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/components/locator/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/locator/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Template Locator</name>
@@ -44,14 +44,6 @@
<dependencies>
<!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: portals/jetspeed-2/trunk/components/page-manager/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Page Manager</name>
@@ -46,15 +46,7 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <artifactId>jetspeed-rdbms</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -62,18 +54,6 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-id-generator</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-locator</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-profiler</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-registry</artifactId>
</dependency>
<dependency>
@@ -81,16 +61,19 @@
<artifactId>jetspeed-security</artifactId>
</dependency>
<dependency>
- <groupId>ojb</groupId>
- <artifactId>db-ojb</artifactId>
- </dependency>
- <dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-id-generator</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Added: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/pom.xml?rev=375977&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (added)
+++ portals/jetspeed-2/trunk/components/pom.xml Wed Feb 8 07:17:42 2006
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 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 xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- POM Identification -->
+
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>components</artifactId>
+ <parent>
+ <groupId>org.apache.portals.jetspeed-2</groupId>
+ <version>2.1-dev</version>
+ <artifactId>pom</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Jetspeed-2 Components</name>
+ <description>
+ Jetspeed-2 Components
+ </description>
+
+ <!-- Components Modules -->
+
+ <modules>
+ <module>capability</module>
+ <module>cm</module>
+ <module>deploy-tool</module>
+ <module>file-cache</module>
+ <module>header-resource</module>
+ <module>id-generator</module>
+ <module>jetspeed</module>
+ <module>locator</module>
+ <module>page-manager</module>
+ <module>portal-site</module>
+ <module>portal</module>
+ <module>portlet-factory</module>
+ <module>prefs</module>
+ <module>profiler</module>
+ <module>rdbms</module>
+ <module>registry</module>
+ <module>rewriter</module>
+ <module>search</module>
+ <module>security</module>
+ <!--
+ Issue: no Maven2 maven-directory-plugin or equivalent
+ ant task available to generate schema classes.
+
+ <module>security-schema</module>
+ -->
+ <module>serializer</module>
+ <module>sso</module>
+ <module>statistics</module>
+ <module>web-content</module>
+ </modules>
+
+ <!-- Component Dependencies -->
+
+ <dependencies>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>tyrex</groupId>
+ <artifactId>tyrex</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>org.apache.jetspeed.test.jdbc.drivers.path</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <!-- Project Information -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/components/</url>
+ </scm>
+
+</project>
Propchange: portals/jetspeed-2/trunk/components/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/components/portal-site/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Portal Site</name>
@@ -45,28 +45,35 @@
<!-- Build Dependencies -->
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
+
+ <!-- Test Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
+ <artifactId>jetspeed-cm</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <artifactId>jetspeed-profiler</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-page-manager</artifactId>
+ <artifactId>jetspeed-id-generator</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-registry</artifactId>
+ <artifactId>jetspeed-file-cache</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-locator</artifactId>
+ <artifactId>jetspeed-page-manager</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Portal Components</name>
@@ -46,114 +46,122 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
+ <artifactId>jetspeed-rdbms</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
+ <artifactId>jetspeed-deploy-tools</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <artifactId>content-server</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-deploy-tools</artifactId>
+ <artifactId>jetspeed-prefs</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-file-cache</artifactId>
+ <artifactId>jetspeed-registry</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-id-generator</artifactId>
+ <artifactId>jetspeed-page-manager</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-locator</artifactId>
+ <artifactId>jetspeed-security</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-profiler</artifactId>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-registry</artifactId>
+ <groupId>velocity-tools</groupId>
+ <artifactId>velocity-tools</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-security</artifactId>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-velocity</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-statistics</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-rdbms</artifactId>
+ <groupId>taglibs</groupId>
+ <artifactId>random</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-prefs</artifactId>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-search</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-capability</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-portal-site</artifactId>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-page-manager</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-portlet-factory</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-sso</artifactId>
+ <groupId>javamail</groupId>
+ <artifactId>javamail</artifactId>
</dependency>
+
+ <!-- Test Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-header-resource</artifactId>
+ <artifactId>jetspeed-statistics</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>content-server</artifactId>
+ <artifactId>jetspeed-header-resource</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-search</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>velocity-tools</groupId>
- <artifactId>velocity-tools</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-sso</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-profiler</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>random</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-id-generator</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-capability</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>javamail</groupId>
- <artifactId>javamail</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>jetspeed-portal-site</artifactId>
+ <scope>test</scope>
</dependency>
-
- <!-- Test Dependencies -->
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
@@ -164,7 +172,6 @@
<artifactId>mockrunner</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
Modified: portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portlet-factory/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Portlet Factory</name>
@@ -44,14 +44,6 @@
<dependencies>
<!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: portals/jetspeed-2/trunk/components/prefs/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Preferences SPI Components</name>
@@ -46,23 +46,19 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-rdbms</artifactId>
</dependency>
+ <!--
+ Note: junit is normally required only for test, but
+ in this case, abstract test cases are included in the
+ component build... this should probably be fixed...
+ for now, assume that junit will be provided if these
+ test classes are used.
+ -->
<dependency>
- <groupId>ojb</groupId>
- <artifactId>db-ojb</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/trunk/components/profiler/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Profiler</name>
@@ -46,31 +46,15 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <artifactId>jetspeed-locator</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-registry</artifactId>
+ <artifactId>jetspeed-rdbms</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-security</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-locator</artifactId>
- </dependency>
- <dependency>
- <groupId>ojb</groupId>
- <artifactId>db-ojb</artifactId>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/components/rdbms/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 RDBMS Components</name>
@@ -52,9 +52,22 @@
<groupId>ojb</groupId>
<artifactId>db-ojb</artifactId>
</dependency>
+ <!--
+ Note: tyrex and junit are normally required only for test, but
+ in this case, abstract test cases are included in the component
+ build... this should probably be fixed... for now, assume that
+ tyrex and/or junit will be provided if these test classes are
+ used.
+ -->
<dependency>
<groupId>tyrex</groupId>
<artifactId>tyrex</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/components/registry/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Registry Components</name>
@@ -46,15 +46,7 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <artifactId>jetspeed-rdbms</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -64,9 +56,17 @@
<groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-prefs</artifactId>
</dependency>
- <dependency>
- <groupId>ojb</groupId>
- <artifactId>db-ojb</artifactId>
+ <!--
+ Note: junit is normally required only for test, but
+ in this case, abstract test cases are included in the
+ component build... this should probably be fixed...
+ for now, assume that junit will be provided if these
+ test classes are used.
+ -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/trunk/components/rewriter/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rewriter/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Rewriter Component</name>
@@ -49,10 +49,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
</dependency>
@@ -68,9 +64,12 @@
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
</dependency>
+
+ <!-- Test Dependencies -->
<dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/components/search/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/search/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/search/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/search/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Search Component</name>
@@ -44,14 +44,6 @@
<dependencies>
<!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
Modified: portals/jetspeed-2/trunk/components/security-schema/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security-schema/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security-schema/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security-schema/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Security LDAP Schema Components</name>
Modified: portals/jetspeed-2/trunk/components/security/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Security Components</name>
@@ -46,15 +46,7 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <artifactId>jetspeed-rdbms</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -72,9 +64,17 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <!--
+ Note: junit is normally required only for test, but
+ in this case, abstract test cases are included in the
+ component build... this should probably be fixed...
+ for now, assume that junit will be provided if these
+ test classes are used.
+ -->
<dependency>
- <groupId>ojb</groupId>
- <artifactId>db-ojb</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/components/serializer/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/serializer/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Serializer</name>
@@ -45,16 +45,16 @@
<!-- Build Dependencies -->
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
+ <groupId>springframework</groupId>
+ <artifactId>spring</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>xstream</groupId>
Modified: portals/jetspeed-2/trunk/components/sso/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Single Sign On SSO Components</name>
@@ -46,27 +46,11 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-cm</artifactId>
+ <artifactId>jetspeed-rdbms</artifactId>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-velocity</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Modified: portals/jetspeed-2/trunk/components/statistics/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/statistics/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Portal Statistics Components</name>
@@ -46,15 +46,15 @@
<!-- Build Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
+ <artifactId>jetspeed-rdbms</artifactId>
</dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
</dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-rdbms</artifactId>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: portals/jetspeed-2/trunk/components/web-content/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/web-content/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/pom.xml Wed Feb 8 07:17:42 2006
@@ -30,8 +30,8 @@
<parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>2.1-dev</version>
- <artifactId>pom</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>components</artifactId>
+ <relativePath>../pom.xml</relativePath>
</parent>
<packaging>jar</packaging>
<name>Jetspeed-2 Web Content</name>
@@ -44,14 +44,6 @@
<dependencies>
<!-- Build Dependencies -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>jetspeed-api</artifactId>
- </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-sso</artifactId>
Modified: portals/jetspeed-2/trunk/content-server/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/content-server/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/content-server/pom.xml (original)
+++ portals/jetspeed-2/trunk/content-server/pom.xml Wed Feb 8 07:17:42 2006
@@ -45,16 +45,8 @@
<!-- Build Dependencies -->
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/jetspeed-api/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/pom.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/pom.xml Wed Feb 8 07:17:42 2006
@@ -39,26 +39,6 @@
Core API for implementing Jetspeed.
</description>
- <!-- Dependencies -->
-
- <dependencies>
-
- <!-- Build Dependencies -->
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- </dependency>
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </dependency>
-
- </dependencies>
-
<!-- Project Information -->
<scm>
Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=375977&r1=375976&r2=375977&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Wed Feb 8 07:17:42 2006
@@ -134,39 +134,16 @@
<module>etc</module>
<!-- J2 Components -->
- <module>components/capability</module>
- <module>components/cm</module>
- <module>components/registry</module>
- <module>components/rdbms</module>
- <module>components/portlet-factory</module>
- <module>components/prefs</module>
- <module>components/deploy-tool</module>
- <module>components/file-cache</module>
- <module>components/header-resource</module>
- <module>components/id-generator</module>
- <module>components/jetspeed</module>
- <module>components/locator</module>
- <module>components/page-manager</module>
- <module>components/profiler</module>
- <module>components/security</module>
- <module>components/portal-site</module>
- <module>components/rewriter</module>
- <module>components/search</module>
- <module>components/serializer</module>
- <module>components/sso</module>
- <module>components/statistics</module>
- <module>components/web-content</module>
- <module>components/portal</module>
- <!--
- Issue: no Maven2 maven-directory-plugin or equivalent
- ant task available to generate schema classes.
+ <module>components</module>
- <module>components/security-schema</module>
+ <!-- J2 Portal Applications -->
+ <!--
+ <module>layout-portlets</module>
-->
- <!-- J2 Portal -->
+ <!-- J2 Applications -->
<!--
- <module>layout-portlets</module>
+ <module>applications</module>
-->
</modules>
@@ -213,6 +190,14 @@
<dependencyManagement>
<dependencies>
+ <!-- J2 Subprojects -->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>etc</artifactId>
+ <type>pom</type>
+ <version>${pom.version}</version>
+ </dependency>
+
<!-- J2 Components -->
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -473,15 +458,10 @@
<!-- Test -->
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>etc</artifactId>
- <type>pom</type>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit-addons</groupId>
@@ -493,16 +473,19 @@
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>${jmock.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>mockrunner</groupId>
<artifactId>mockrunner</artifactId>
<version>${mockrunner.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>tyrex</groupId>
<artifactId>tyrex</artifactId>
<version>${tyrex.version}</version>
+ <scope>test</scope>
</dependency>
<!-- XML -->
@@ -812,14 +795,36 @@
<!-- Global Dependencies -->
<dependencies>
+
+ <!-- Provided Dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.jetspeed.test.jdbc.drivers.path</artifactId>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.portals.bridges</groupId>
+ <artifactId>portals-bridges-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<!-- Project Information -->
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org