portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject svn commit: r216052 [2/5] - in /portals/jetspeed-2/trunk: components/cm/ components/deploy-tool/ components/file-cache/ components/id-generator/ components/jetspeed/ components/locator/ components/page-manager/ components/persistence/ components/portal...
Date Wed, 13 Jul 2005 00:40:09 GMT
Modified: portals/jetspeed-2/trunk/components/persistence/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/persistence/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/persistence/project.xml (original)
+++ portals/jetspeed-2/trunk/components/persistence/project.xml Tue Jul 12 17:40:07 2005
@@ -3,193 +3,199 @@
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
 <!--
-Copyright 2004 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
-
+    Copyright 2004 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>
-<extend>${basedir}/../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed-persistence</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Persistence Components</name>
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Persistence Components
-  </description>
-  <shortDescription>Persistence Components</shortDescription>
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/persistence/</url>
-  </repository>
-
-  <dependencies>
-  
-  	&spring-deps;
-  	
-  	&db-ojb-deps;
-  	
-    <dependency>
-      <id>jetspeed-commons</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-    </dependency>
-     <dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
     
-    <!-- testing only -->
-    <dependency>
-      <id>jetspeed-rdbms</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-    </dependency>
-  	 <dependency>
-      <id>commons-lang</id>
-      <version>2.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-logging</id>
-      <version>1.0.3</version>
-    </dependency>
-    <dependency>
-      <id>commons-beanutils</id>
-      <version>1.6.1</version>
-    </dependency>
-    <dependency>
-      <id>junit</id>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <id>log4j</id>
-      <version>1.2.8</version>
-    </dependency>
-    <dependency>
-      <id>commons-collections</id>
-      <version>3.0</version>
-    </dependency>
-    <dependency>
-      <id>commons-io</id>
-      <version>0.1</version>
-    </dependency>
+    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.
     
-    <dependency>
-      <id>commons-pool</id>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <id>commons-dbcp</id>
-      <version>1.2.1</version>
-    </dependency>
-    <dependency>
-      <id>jdbc-se</id>
-      <jar>jdbc-se2.0.jar</jar>
-    </dependency>
-    <dependency>
-      <id>xerces</id>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <id>xml-apis</id>
-      <version>2.0.2</version>
-    </dependency>
-     <dependency>
-      <id>jdom</id>
-      <version>1.0</version>
-
-    </dependency>
-    <!-- This is only a test dependency -->
-    <dependency>
-      <id>hsqldb</id>
-      <version>1.7.1</version>
-    </dependency>
-   
-    <dependency>
-      <id>jta</id>
-      <jar>jta1.0.1.jar</jar>
-    </dependency>
-    <dependency>
-      <id>portlet-api</id>
-      <version>1.0</version>
-    </dependency>
-    <!-- Testing only -->
-    <dependency>
-      <id>tyrex</id>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <id>jmock</id>
-      <version>SNAPSHOT</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <sourceModifications >
-
-    <sourceModification >
-    	<className>foo.bar</className>
-      <excludes>
-         <exclude>**/otm/*.java</exclude>
-      </excludes>
-    </sourceModification>
-    </sourceModifications>
-
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <unitTest>
-       <includes>
-        <include>**/Test*.java</include>
-      </includes>
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-        
-        &db-ojb-resources;
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
-
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-  </build>
-  <reports>
-  
-  	&j2-reports;
-  
-  </reports>  
+    $Id$
+-->
+<project>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-persistence</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Persistence Components</name>
+    <package>org.apache.jetspeed</package>
+    <description>Persistence Components</description>
+    <shortDescription>Persistence Components</shortDescription>
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/persistence/</url>
+    </repository>
+
+    <dependencies>
+
+        &spring-deps;
+
+        &db-ojb-deps;
+
+        <dependency>
+            <id>jetspeed-commons</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <!-- testing only -->
+        <dependency>
+            <id>jetspeed-rdbms</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>commons-lang</id>
+            <version>2.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <id>commons-beanutils</id>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <id>junit</id>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <id>log4j</id>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <id>commons-collections</id>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-io</id>
+            <version>0.1</version>
+        </dependency>
+
+        <dependency>
+            <id>commons-pool</id>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <id>commons-dbcp</id>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <id>jdbc-se</id>
+            <jar>jdbc-se2.0.jar</jar>
+        </dependency>
+        <dependency>
+            <id>xerces</id>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <id>xml-apis</id>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <id>jdom</id>
+            <version>1.0</version>
+
+        </dependency>
+        <!-- This is only a test dependency -->
+        <dependency>
+            <id>hsqldb</id>
+            <version>1.7.1</version>
+        </dependency>
+
+        <dependency>
+            <id>jta</id>
+            <jar>jta1.0.1.jar</jar>
+        </dependency>
+        <dependency>
+            <id>portlet-api</id>
+            <version>1.0</version>
+        </dependency>
+        <!-- Testing only -->
+        <dependency>
+            <id>tyrex</id>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <id>jmock</id>
+            <version>SNAPSHOT</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <sourceModifications>
+
+            <sourceModification>
+                <className>foo.bar</className>
+                <excludes>
+                    <exclude>**/otm/*.java</exclude>
+                </excludes>
+            </sourceModification>
+        </sourceModifications>
+
+        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+        <unitTest>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+
+                &db-ojb-resources;
+
+                &log4j-resources;
+
+            </resources>
+        </unitTest>
+
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+    </build>
+    <reports>
+
+        &j2-reports;
+
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/portal/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,29 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 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
-
+    Copyright 2004 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.
+    
+    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.
 -->
-<project default="java:jar"
-         xmlns:j="jelly:core"
-         xmlns:define="jelly:define"
-         xmlns:maven="jelly:maven">
-
-  <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager'/>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
 
-   <goal name="deployJar">
-  	<attainGoal name="jar:install"/>
-  	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
-  </goal>
+    <!-- Target of maven test:single test -->
+    <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager' />
 
 </project>

Modified: portals/jetspeed-2/trunk/components/portal/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/project.xml Tue Jul 12 17:40:07 2005
@@ -3,399 +3,393 @@
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
 <!--
-	Copyright 2004 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.xml 189937 2005-06-10 10:51:53Z ate $
+    Copyright 2004 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.xml 189937 2005-06-10 10:51:53Z ate $
 -->
 <project>
-	<extend>${basedir}/../../project.xml</extend>
-	<pomVersion>3</pomVersion>
-	<id>jetspeed-portal</id>
-	<groupId>jetspeed2</groupId>
-	<name>Jetspeed-2 Portal Components</name>
-	<package>org.apache.jetspeed</package>
-	<description>Portal Components</description>
-	<shortDescription>Portal Components</shortDescription>
-	<repository>
-		<connection>
-			scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence
-		</connection>
-		<developerConnection>
-			scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence
-		</developerConnection>
-		<url>
-			http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/persistence/
-		</url>
-	</repository>
-
-	<dependencies>
-
-		&spring-deps;
-
-		&db-ojb-deps;
-
-		&jmock-deps;
-
-		&commons-config-dep;
-
-		<dependency>
-			<id>jetspeed-cm</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>content-server</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-components</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-deploy-tools</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-rdbms</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-persistence</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-prefs</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-search</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-security</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-registry</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-id-generator</id>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-file-cache</id>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-api</id>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-locator</id>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-capability</id>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-profiler</id>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-page-manager</id>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-portlet-factory</id>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-
-		&pluto-deps;
-
-		<dependency>
-			<id>castor</id>
-			<version>0.9.4.3</version>
-		</dependency>
-		<dependency>
-			<id>commons-beanutils</id>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<id>commons-digester</id>
-			<version>1.5</version>
-		</dependency>
-		<dependency>
-			<id>commons-configuration</id>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<id>commons-collections</id>
-			<version>3.0</version>
-		</dependency>
-		<dependency>
-			<id>commons-fileupload</id>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<id>commons-httpclient</id>
-			<version>2.0</version>
-		</dependency>
-		<dependency>
-			<id>commons-io</id>
-			<version>0.1</version>
-		</dependency>
-		<dependency>
-			<id>commons-lang</id>
-			<version>2.0</version>
-		</dependency>
-		<dependency>
-			<id>commons-logging</id>
-			<version>1.0.3</version>
-		</dependency>
-		<dependency>
-			<id>hsqldb</id>
-			<version>1.7.1</version>
-		</dependency>
-
-		<dependency>
-			<id>commons-pool</id>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<id>commons-dbcp</id>
-			<version>1.2.1</version>
-		</dependency>
-		<dependency>
-			<id>jdbc-se</id>
-			<jar>jdbc-se2.0.jar</jar>
-		</dependency>
-		<dependency>
-			<id>jetspeed-commons</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-		<dependency>
-			<id>lucene</id>
-			<version>1.4.1</version>
-		</dependency>
-		<dependency>
-			<id>junit</id>
-			<version>3.8.1</version>
-		</dependency>
-		<dependency>
-			<id>jta</id>
-			<jar>jta1.0.1.jar</jar>
-		</dependency>
-		<dependency>
-			<id>log4j</id>
-			<version>1.2.8</version>
-		</dependency>
-		<dependency>
-			<id>portlet-api</id>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<id>servletapi</id>
-			<version>2.3</version>
-		</dependency>
-		<dependency>
-			<id>tyrex</id>
-			<version>1.0.1</version>
-		</dependency>
-		<dependency>
-			<id>xalan</id>
-			<version>2.4.1</version>
-		</dependency>
-		<dependency>
-			<id>xerces</id>
-			<version>2.3.0</version>
-		</dependency>
-		<dependency>
-			<id>xml-apis</id>
-			<version>2.0.2</version>
-		</dependency>
-		<dependency>
-			<id>saxpath</id>
-			<version>1.0-FCS</version>
-		</dependency>
-		<dependency>
-			<id>jaxen</id>
-			<version>1.0-FCS-full</version>
-		</dependency>
-		<dependency>
-			<id>jdom</id>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<id>regexp</id>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<id>jstl</id>
-			<version>1.0.6</version>
-		</dependency>
-		<dependency>
-			<id>taglibs:standard</id>
-			<version>1.0.6</version>
-		</dependency>
-		<dependency>
-			<id>taglibs:request</id>
-			<version>1.0.1</version>
-		</dependency>
-		<dependency>
-			<id>velocity</id>
-			<version>1.4</version>
-		</dependency>
-		<dependency>
-			<id>velocity-tools</id>
-			<version>1.1</version>
-			<url>http://jakarta.apache.org/velocity</url>
-		</dependency>
-		<dependency>
-			<id>mockrunner</id>
-			<version>0.2.7</version>
-		</dependency>
-		<dependency>
-			<id>commons-codec</id>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<id>jetspeed-sso</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				&jetspeed-version;
-			</version>
-		</dependency>
-
-		<dependency>
-			<id>portals-bridges:portals-bridges-common</id>
-			<version>
-				&portals-bridges-common-version;
-			</version>
-			<properties>
-				<war.bundle>false</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<id>portals-bridges-velocity</id>
-			<groupId>portals-bridges</groupId>
-			<version>
-				&portals-bridges-velocity-version;
-			</version>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-
-	</dependencies>
-	<build>
-		<sourceDirectory>src/java</sourceDirectory>
-		<sourceModifications>
-
-			<sourceModification>
-				<className>foo.bar</className>
-				<excludes>
-					<exclude>**/otm/*.java</exclude>
-				</excludes>
-			</sourceModification>
-		</sourceModifications>
-
-		<unitTestSourceDirectory>
-			${basedir}/src/test
-		</unitTestSourceDirectory>
-		<unitTest>
-			<includes>
-				<include>**/Test*.java</include>
-			</includes>
-			<resources>
-				<resource>
-					<directory>${basedir}/src/test</directory>
-					<excludes>
-						<exclude>**/*.java</exclude>
-					</excludes>
-				</resource>
-
-				&db-ojb-resources;
-
-				&log4j-resources;
-
-			</resources>
-		</unitTest>
-
-		<resources>
-			<resource>
-				<directory>${basedir}/src/java</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-portal</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Portal Components</name>
+    <package>org.apache.jetspeed</package>
+    <description>Portal Components</description>
+    <shortDescription>Portal Components</shortDescription>
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/persistence/</url>
+    </repository>
+
+    <dependencies>
+
+        &spring-deps;
+
+        &db-ojb-deps;
+
+        &jmock-deps;
+
+        &commons-config-dep;
+
+        <dependency>
+            <id>jetspeed-cm</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>content-server</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-components</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-deploy-tools</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-rdbms</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-persistence</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-prefs</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-search</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-security</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-registry</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-id-generator</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-file-cache</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-locator</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-capability</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-profiler</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-page-manager</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-portlet-factory</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+
+        &pluto-deps;
+
+        <dependency>
+            <id>castor</id>
+            <version>0.9.4.3</version>
+        </dependency>
+        <dependency>
+            <id>commons-beanutils</id>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <id>commons-digester</id>
+            <version>1.5</version>
+        </dependency>
+        <dependency>
+            <id>commons-configuration</id>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-collections</id>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-fileupload</id>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-httpclient</id>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-io</id>
+            <version>0.1</version>
+        </dependency>
+        <dependency>
+            <id>commons-lang</id>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <id>hsqldb</id>
+            <version>1.7.1</version>
+        </dependency>
+
+        <dependency>
+            <id>commons-pool</id>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <id>commons-dbcp</id>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <id>jdbc-se</id>
+            <jar>jdbc-se2.0.jar</jar>
+        </dependency>
+        <dependency>
+            <id>jetspeed-commons</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>lucene</id>
+            <version>1.4.1</version>
+        </dependency>
+        <dependency>
+            <id>junit</id>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <id>jta</id>
+            <jar>jta1.0.1.jar</jar>
+        </dependency>
+        <dependency>
+            <id>log4j</id>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <id>portlet-api</id>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <id>servletapi</id>
+            <version>2.3</version>
+        </dependency>
+        <dependency>
+            <id>tyrex</id>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <id>xalan</id>
+            <version>2.4.1</version>
+        </dependency>
+        <dependency>
+            <id>xerces</id>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <id>xml-apis</id>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <id>saxpath</id>
+            <version>1.0-FCS</version>
+        </dependency>
+        <dependency>
+            <id>jaxen</id>
+            <version>1.0-FCS-full</version>
+        </dependency>
+        <dependency>
+            <id>jdom</id>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <id>regexp</id>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <id>jstl</id>
+            <version>1.0.6</version>
+        </dependency>
+        <dependency>
+            <id>taglibs:standard</id>
+            <version>1.0.6</version>
+        </dependency>
+        <dependency>
+            <id>taglibs:request</id>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <id>velocity</id>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <id>velocity-tools</id>
+            <version>1.1</version>
+            <url>http://jakarta.apache.org/velocity</url>
+        </dependency>
+        <dependency>
+            <id>mockrunner</id>
+            <version>0.2.7</version>
+        </dependency>
+        <dependency>
+            <id>commons-codec</id>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <id>jetspeed-sso</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+
+        <dependency>
+            <id>portals-bridges:portals-bridges-common</id>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>portals-bridges-velocity</id>
+            <groupId>portals-bridges</groupId>
+            <version>
+                &portals-bridges-velocity-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <sourceModifications>
+
+            <sourceModification>
+                <className>foo.bar</className>
+                <excludes>
+                    <exclude>**/otm/*.java</exclude>
+                </excludes>
+            </sourceModification>
+        </sourceModifications>
+
+        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+        <unitTest>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+
+                &db-ojb-resources;
+
+                &log4j-resources;
+
+            </resources>
+        </unitTest>
+
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
 
-	</build>
-	<reports>
+    </build>
+    <reports>
 
-		&j2-reports;
+        &j2-reports;
 
-	</reports>
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/portlet-factory/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portlet-factory/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,38 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 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
-
+    Copyright 2004 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.
+    
+    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.
 -->
-<project default="java:jar"
-         xmlns:j="jelly:core" 
-         xmlns:define="jelly:define"
-         xmlns:ant="jelly:ant">
-  
-   <goal name="deployJar">
-  	<attainGoal name="jar:install"/>
-  	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
-  </goal>
-  
-  <!--
-  <preGoal name="jar:jar">
-  	 <j:forEach var="lib" items="${pom.artifacts}">
-      <j:set var="dep" value="${lib.dependency}"/>     
-      <j:if test="${dep.getProperty('jar.bundle')=='true'}">
-         <j:if test="${dep.type =='jar'}"> 
-           <ant:copy todir="${maven.build.dest}/lib" file="${lib.path}"/>  
-         </j:if> 
-      </j:if>  
-    </j:forEach>  	
-  </preGoal>
-  -->
-</project>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:ant="jelly:ant" />

Modified: portals/jetspeed-2/trunk/components/portlet-factory/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portlet-factory/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/project.xml Tue Jul 12 17:40:07 2005
@@ -3,121 +3,126 @@
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
 <!--
-Copyright 2004 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
-
+    Copyright 2004 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$
+    
+    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>
-<extend>${basedir}/../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed-portlet-factory</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Portlet Factory</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Jetspeed Portlet Factory
-  </description>
-  <shortDescription>Portlet Factory</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portlet-factory</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portlet-factory</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portlet-factory/</url>
-  </repository>
-
-  <dependencies>
-      
-      &pluto-deps;
-      
-    <dependency>
-      <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-      <id>portlet-api</id>
-      <version>1.0</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>servletapi</id>
-      <version>2.3</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>           
-    <dependency>
-      <id>jetspeed2:jetspeed-commons</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>commons-logging</id>
-      <version>1.0.3</version>
-    </dependency>
-    <dependency>
-      <id>commons-io</id>
-      <version>0.1</version>
-    </dependency>
-    <dependency>
-      <id>commons-lang</id>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <id>junit</id>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <id>log4j</id>
-      <version>1.2.8</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-     <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    <unitTest>
-       <includes>
-        <include>**/Test*.java</include>
-      </includes>
-      <excludes>
-      </excludes>
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-      </resources>
-    </unitTest>
-    
-  </build>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-portlet-factory</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Portlet Factory</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Jetspeed Portlet Factory</description>
+    <shortDescription>Portlet Factory</shortDescription>
+
+    <repository>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portlet-factory
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portlet-factory
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portlet-factory/</url>
+    </repository>
+
+    <dependencies>
+
+        &pluto-deps;
+
+        <dependency>
+            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
+            <id>portlet-api</id>
+            <version>1.0</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>servletapi</id>
+            <version>2.3</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-commons</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <id>commons-io</id>
+            <version>0.1</version>
+        </dependency>
+        <dependency>
+            <id>commons-lang</id>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <id>junit</id>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <id>log4j</id>
+            <version>1.2.8</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+        <unitTest>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+            <excludes></excludes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+            </resources>
+        </unitTest>
+
+    </build>
+
+    <reports>
+
+        &j2-reports;
 
-  <reports>
-  
-  	&j2-reports;
-  
-  </reports>  
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/prefs/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,29 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 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
-
+    Copyright 2004 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.
+    
+    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.
 -->
-<project default="java:jar"
-         xmlns:j="jelly:core"
-         xmlns:define="jelly:define"
-         xmlns:maven="jelly:maven">
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
 
-  <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.prefs.TestPreferences'/>
-  
-  <goal name="deployJar">
-  	<attainGoal name="jar:install"/>
-  	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
-  </goal> 
+    <!-- Target of maven test:single test -->
+    <property name='testcase' value='org.apache.jetspeed.prefs.TestPreferences' />
 
 </project>

Modified: portals/jetspeed-2/trunk/components/prefs/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/project.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/project.xml Tue Jul 12 17:40:07 2005
@@ -3,248 +3,258 @@
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
 <!--
-Copyright 2004 The Apache Software Foundation
+    Copyright 2004 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>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-prefs</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Preferences SPI Components</name>
+
+    <description>Preferences SPI Components</description>
+    <shortDescription>Preferences SPI Components</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/perfs</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/perfs
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/perfs/</url>
+    </repository>
 
-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
+    <dependencies>
 
-    http://www.apache.org/licenses/LICENSE-2.0
+        &spring-deps;
 
-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.
+        &db-ojb-deps;
 
-  $Id$
--->
-<project>
-  <extend>${basedir}/../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed-prefs</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Preferences SPI Components</name>
-
-  <description>
-	  Preferences SPI Components
-  </description>
-  <shortDescription>Preferences SPI Components</shortDescription>
-
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/perfs</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/perfs</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/perfs/</url>
-  </repository>
-
-  <dependencies>
-  
-  	&spring-deps;
-  	
-  	&db-ojb-deps;
-  	
-  	&commons-config-dep;
-  	
-    <dependency>
-      <id>jetspeed-cm</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>    
-    <dependency>
-      <id>jetspeed-persistence</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <!-- Testing only -->
-    <dependency>
-      <id>jetspeed-rdbms</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-  	 <dependency>
-      <id>commons-lang</id>
-      <version>2.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-logging</id>
-      <version>1.0.3</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-beanutils</id>
-      <version>1.6.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>junit</id>
-      <version>3.8.1</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-
-      <id>log4j</id>
-      <version>1.2.8</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-collections</id>
-      <version>3.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-io</id>
-      <version>0.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <id>commons-pool</id>
-      <version>1.2</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-dbcp</id>
-      <version>1.2.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jdbc-se</id>
-      <jar>jdbc-se2.0.jar</jar>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-        <dependency>
-      <id>xerces</id>
-      <version>2.3.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>xml-apis</id>
-      <version>2.0.2</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>jdom</id>
-      <version>1.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <!-- This is only a test dependency -->
-    <dependency>
-      <id>jetspeed-commons</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>hsqldb</id>
-      <version>1.7.1</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <id>jta</id>
-      <jar>jta1.0.1.jar</jar>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>tyrex</id>
-      <version>1.0.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <unitTest>
-       <includes>
-        <include>**/Test*.java</include>
-      </includes>
-
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-           <exclude>repository_database.xml</exclude>
-          </excludes>
-        </resource>
-        <resource>
-          <directory>${basedir}/src/java</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-        
-        &db-ojb-resources;
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
-
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-  </build>
-  <reports>
-  
-  	&j2-reports;
-  
-  </reports>  
+        &commons-config-dep;
+
+        <dependency>
+            <id>jetspeed-cm</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed-persistence</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <!-- Testing only -->
+        <dependency>
+            <id>jetspeed-rdbms</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>commons-lang</id>
+            <version>2.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0.3</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>commons-beanutils</id>
+            <version>1.6.1</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>junit</id>
+            <version>3.8.1</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+
+            <id>log4j</id>
+            <version>1.2.8</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>commons-collections</id>
+            <version>3.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>commons-io</id>
+            <version>0.1</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <id>commons-pool</id>
+            <version>1.2</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>commons-dbcp</id>
+            <version>1.2.1</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jdbc-se</id>
+            <jar>jdbc-se2.0.jar</jar>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>xerces</id>
+            <version>2.3.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>xml-apis</id>
+            <version>2.0.2</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jdom</id>
+            <version>1.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <!-- This is only a test dependency -->
+        <dependency>
+            <id>jetspeed-commons</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>hsqldb</id>
+            <version>1.7.1</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <id>jta</id>
+            <jar>jta1.0.1.jar</jar>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>tyrex</id>
+            <version>1.0.1</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+        <unitTest>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                        <exclude>repository_database.xml</exclude>
+                    </excludes>
+                </resource>
+                <resource>
+                    <directory>${basedir}/src/java</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+
+                &db-ojb-resources;
+
+                &log4j-resources;
+
+            </resources>
+        </unitTest>
+
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+    </build>
+    <reports>
+
+        &j2-reports;
+
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/profiler/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,28 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 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
-
+    Copyright 2004 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.
+    
+    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.
 -->
-<project default="java:jar"
-         xmlns:j="jelly:core" 
-         xmlns:define="jelly:define">
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define">
+
+    <property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent' />
 
-   <property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/> 
-  
-   <goal name="deployJar">
-    <property name='maven.test.skip' value='true'/> 
-  	<attainGoal name="jar:install"/>
-  	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
-  </goal>
-  
 </project>

Modified: portals/jetspeed-2/trunk/components/profiler/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/project.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/project.xml Tue Jul 12 17:40:07 2005
@@ -3,235 +3,251 @@
   <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
 ]>
 <!--
-Copyright 2004 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>
-  <extend>${basedir}/../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed-profiler</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Profiler</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Profiler implementations.
-  </description>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/profiler</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/profiler</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/profiler/</url>
-  </repository>
-
-  <shortDescription>Profiler</shortDescription>
-  <dependencies>
-  
-  	&spring-deps;
-  	
-  	&db-ojb-deps;
-  	
-  	&commons-config-dep;
-  	
-  	<dependency>
-      <id>jetspeed-cm</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>  	
-   	<dependency>
-      <id>jetspeed2:jetspeed-commons</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-persistence</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-registry</id>
-      <version>&jetspeed-version;</version>
-    </dependency>      
-    <dependency>
-      <id>jetspeed2:jetspeed-security</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-locator</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <!-- Testing only -->
-    <dependency>
-      <id>jetspeed2:jetspeed-rdbms</id>
-      <version>&jetspeed-version;</version>
-    </dependency>    	
-  	 <dependency>
-      <id>commons-lang</id>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <id>commons-logging</id>
-      <version>1.0.3</version>
-    </dependency>
-    <dependency>
-      <id>commons-beanutils</id>
-      <version>1.6.1</version>
-    </dependency>
-    <dependency>
-      <id>commons-configuration</id>
-      <version>1.0-dev</version>
-    </dependency>
-    <dependency>
-      <id>junit</id>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <id>log4j</id>
-      <version>1.2.6</version>
-    </dependency>   
-    <dependency>
-      <id>commons-collections</id>
-      <version>3.0</version>
-    </dependency>
-    <dependency>
-      <id>commons-io</id>
-      <version>0.1</version>
-    </dependency>
-    <dependency>
-      <id>xerces</id>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <id>xml-apis</id>
-      <version>2.0.2</version>
-    </dependency>
-    <dependency>
-      <id>tyrex</id>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <id>jta</id>
-      <jar>jta1.0.1.jar</jar>
-    </dependency>
+    Copyright 2004 The Apache Software Foundation
     
-    <dependency>
-      <id>commons-pool</id>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <id>commons-dbcp</id>
-      <version>1.2.1</version>
-    </dependency>
-    <dependency>
-      <id>castor</id>
-      <version>0.9.4.3</version>
-    </dependency>
-    <dependency>
-      <id>xerces</id>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <id>xml-apis</id>
-      <version>2.0.2</version>
-    </dependency>
-    <dependency>
-      <id>saxpath</id>
-      <version>1.0-FCS</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-      <dependency>
-      <id>jaxen</id>
-      <version>1.0-FCS-full</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>jdom</id>
-      <version>1.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <!-- This is only a test dependency -->
-    <dependency>
-      <id>hsqldb</id>
-      <version>1.7.1</version>
-    </dependency>
-      
-      &pluto-deps;
-      
-     <dependency>
-      <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-      <id>portlet-api</id>
-      <version>1.0</version>
-    </dependency>
-     <dependency>
-      <id>servletapi</id>
-      <version>2.3</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
- 
+    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
     
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <unitTest>
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-        <resource>
-          <directory>${basedir}/src/java</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-           <exclude>**/META-INF/**</exclude>
-          </excludes>
-        </resource>
-      
-        &db-ojb-resources;
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
+    http://www.apache.org/licenses/LICENSE-2.0
     
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
+    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.
     
-  </build>
-  <reports>
-  
-  	&j2-reports;
-  
-  </reports>  
+    $Id$
+-->
+<project>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-profiler</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Profiler</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Profiler implementations.</description>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/profiler</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/profiler
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/profiler/</url>
+    </repository>
+
+    <shortDescription>Profiler</shortDescription>
+    <dependencies>
+
+        &spring-deps;
+
+        &db-ojb-deps;
+
+        &commons-config-dep;
+
+        <dependency>
+            <id>jetspeed-cm</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-commons</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-persistence</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-registry</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-security</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-locator</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <!-- Testing only -->
+        <dependency>
+            <id>jetspeed2:jetspeed-rdbms</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>commons-lang</id>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <id>commons-beanutils</id>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <id>commons-configuration</id>
+            <version>1.0-dev</version>
+        </dependency>
+        <dependency>
+            <id>junit</id>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <id>log4j</id>
+            <version>1.2.6</version>
+        </dependency>
+        <dependency>
+            <id>commons-collections</id>
+            <version>3.0</version>
+        </dependency>
+        <dependency>
+            <id>commons-io</id>
+            <version>0.1</version>
+        </dependency>
+        <dependency>
+            <id>xerces</id>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <id>xml-apis</id>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <id>tyrex</id>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <id>jta</id>
+            <jar>jta1.0.1.jar</jar>
+        </dependency>
+
+        <dependency>
+            <id>commons-pool</id>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <id>commons-dbcp</id>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <id>castor</id>
+            <version>0.9.4.3</version>
+        </dependency>
+        <dependency>
+            <id>xerces</id>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <id>xml-apis</id>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <id>saxpath</id>
+            <version>1.0-FCS</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jaxen</id>
+            <version>1.0-FCS-full</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jdom</id>
+            <version>1.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <!-- This is only a test dependency -->
+        <dependency>
+            <id>hsqldb</id>
+            <version>1.7.1</version>
+        </dependency>
+
+        &pluto-deps;
+
+        <dependency>
+            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
+            <id>portlet-api</id>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <id>servletapi</id>
+            <version>2.3</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+
+
+        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+        <unitTest>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+                <resource>
+                    <directory>${basedir}/src/java</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                        <exclude>**/META-INF/**</exclude>
+                    </excludes>
+                </resource>
+
+                &db-ojb-resources;
+
+                &log4j-resources;
+
+            </resources>
+        </unitTest>
+
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+    </build>
+    <reports>
+
+        &j2-reports;
+
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/rdbms/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,33 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 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
-
+    Copyright 2004 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.
+    
+    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.
 -->
-<project default="java:jar"
-         xmlns:j="jelly:core"
-         xmlns:maven="jelly:maven"
-         xmlns:define="jelly:define">
-
-  <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.components.TestRDBMS'/>
-  
-   <goal name="deployJar">
-   	<echo message="BaseDir=${basedir}"/>
-  	<attainGoal name="jar:install"/>
-
-
-  	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
-  </goal>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:define="jelly:define">
 
+    <!-- Target of maven test:single test -->
+    <property name='testcase' value='org.apache.jetspeed.components.TestRDBMS' />
 
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message