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 [1/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
Author: dlestrat
Date: Tue Jul 12 17:40:07 2005
New Revision: 216052

URL: http://svn.apache.org/viewcvs?rev=216052&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-304?page=comments#action_12315646 

Modified:
    portals/jetspeed-2/trunk/components/cm/maven.xml
    portals/jetspeed-2/trunk/components/cm/project.xml
    portals/jetspeed-2/trunk/components/deploy-tool/maven.xml
    portals/jetspeed-2/trunk/components/deploy-tool/project.xml
    portals/jetspeed-2/trunk/components/file-cache/maven.xml
    portals/jetspeed-2/trunk/components/file-cache/project.xml
    portals/jetspeed-2/trunk/components/id-generator/maven.xml
    portals/jetspeed-2/trunk/components/id-generator/project.xml
    portals/jetspeed-2/trunk/components/jetspeed/maven.xml
    portals/jetspeed-2/trunk/components/jetspeed/project.xml
    portals/jetspeed-2/trunk/components/locator/maven.xml
    portals/jetspeed-2/trunk/components/locator/project.xml
    portals/jetspeed-2/trunk/components/page-manager/maven.xml
    portals/jetspeed-2/trunk/components/page-manager/project.xml
    portals/jetspeed-2/trunk/components/persistence/maven.xml
    portals/jetspeed-2/trunk/components/persistence/project.xml
    portals/jetspeed-2/trunk/components/portal/maven.xml
    portals/jetspeed-2/trunk/components/portal/project.xml
    portals/jetspeed-2/trunk/components/portlet-factory/maven.xml
    portals/jetspeed-2/trunk/components/portlet-factory/project.xml
    portals/jetspeed-2/trunk/components/prefs/maven.xml
    portals/jetspeed-2/trunk/components/prefs/project.xml
    portals/jetspeed-2/trunk/components/profiler/maven.xml
    portals/jetspeed-2/trunk/components/profiler/project.xml
    portals/jetspeed-2/trunk/components/rdbms/maven.xml
    portals/jetspeed-2/trunk/components/rdbms/project.xml
    portals/jetspeed-2/trunk/components/registry/maven.xml
    portals/jetspeed-2/trunk/components/registry/project.xml
    portals/jetspeed-2/trunk/components/rewriter/maven.xml
    portals/jetspeed-2/trunk/components/rewriter/project.xml
    portals/jetspeed-2/trunk/components/search/maven.xml
    portals/jetspeed-2/trunk/components/search/project.xml
    portals/jetspeed-2/trunk/components/security/maven.xml
    portals/jetspeed-2/trunk/components/security/project.xml
    portals/jetspeed-2/trunk/components/sso/maven.xml
    portals/jetspeed-2/trunk/components/sso/project.xml
    portals/jetspeed-2/trunk/components/web-content/maven.xml
    portals/jetspeed-2/trunk/components/web-content/project.xml
    portals/jetspeed-2/trunk/content-server/maven.xml
    portals/jetspeed-2/trunk/content-server/project.xml
    portals/jetspeed-2/trunk/design-docs/project.xml
    portals/jetspeed-2/trunk/etc/project-dependencies/commons-config-dep.xml
    portals/jetspeed-2/trunk/etc/project-dependencies/db-ojb-deps.xml
    portals/jetspeed-2/trunk/etc/project-dependencies/jmock-deps.xml
    portals/jetspeed-2/trunk/etc/project-dependencies/jsf-api-deps.xml
    portals/jetspeed-2/trunk/etc/project-dependencies/jsf-bridge-deps.xml
    portals/jetspeed-2/trunk/etc/project-dependencies/myfaces-deps.xml
    portals/jetspeed-2/trunk/etc/project-dependencies/pluto-deps.xml
    portals/jetspeed-2/trunk/etc/project-dependencies/spring-deps.xml
    portals/jetspeed-2/trunk/jetspeed-api/maven.xml
    portals/jetspeed-2/trunk/jetspeed-api/project.xml
    portals/jetspeed-2/trunk/layout-portlets/project.xml
    portals/jetspeed-2/trunk/maven-plugin/maven.xml
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
    portals/jetspeed-2/trunk/maven-plugin/plugin.properties
    portals/jetspeed-2/trunk/maven-plugin/project.xml

Modified: portals/jetspeed-2/trunk/components/cm/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/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">
-
-  <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager'/> 
-  
-   <goal name="deployJar">
-  	<attainGoal name="jar:install"/>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define">
 
-  	<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/cm/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/project.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/project.xml Tue Jul 12 17:40:07 2005
@@ -3,119 +3,121 @@
   <!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-cm</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Component Manager</name>  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Component Manager
-  </description>
-  <shortDescription>Common Manager</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/cm</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/cm</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/cm/</url>
-  </repository>
-
-  <dependencies>
-  	&spring-deps; 
-  	&db-ojb-deps; 
-  	<dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</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>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>servletapi</id>
-      <version>2.3</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-      
-      &pluto-deps;
-    
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <unitTest>
-       <includes>
-        <include>**/Test*.java</include>
-      </includes>
-      <excludes>
-           <exclude>**/TestInterceptorAdapter.java</exclude>
-      </excludes>
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
+    Copyright 2004 The Apache Software Foundation
     
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
+    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
     
-  </build>
-
-  <reports>
+    http://www.apache.org/licenses/LICENSE-2.0
     
-    &j2-reports;
+    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.
     
-  </reports>  
+    $Id$
+-->
+<project>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-cm</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Component Manager</name>
+    <package>org.apache.jetspeed</package>
+    <description>Component Manager</description>
+    <shortDescription>Common Manager</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/cm</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/cm
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/cm/</url>
+    </repository>
+
+    <dependencies>
+        &spring-deps;
+        &db-ojb-deps;
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </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>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>servletapi</id>
+            <version>2.3</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+
+        &pluto-deps;
+
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+        <unitTest>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+            <excludes>
+                <exclude>**/TestInterceptorAdapter.java</exclude>
+            </excludes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+
+                &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/deploy-tool/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,24 +1,26 @@
+<?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="uberjar"
-    xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant" >
+<project default="uberjar" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
+
+    <preGoal name="jar:jar">
+        <copy file="../../portal-webapp/src/webapp/WEB-INF/tld/portlet.tld"
+            toDir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy" />
+        <copy file="../../portal-webapp/web-app_2_3.dtd"
+            toDir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy" />
+    </preGoal>
 
-	<preGoal name="jar:jar">
-		<copy file="../../portal-webapp/src/webapp/WEB-INF/tld/portlet.tld" toDir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy"/>
-		<copy file="../../portal-webapp/web-app_2_3.dtd" toDir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy"/>
-	</preGoal>
 </project>

Modified: portals/jetspeed-2/trunk/components/deploy-tool/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/project.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/project.xml Tue Jul 12 17:40:07 2005
@@ -3,32 +3,30 @@
   <!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-deploy-tools</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Deploy Tools</name>  
-  <package>org.apache.jetspeed.tools</package>
-  <description>
-	  Jetspeed Deploy Tools
-  </description>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-deploy-tools</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Deploy Tools</name>
+    <package>org.apache.jetspeed.tools</package>
+    <description>Jetspeed Deploy Tools</description>
 
     <dependencies>
         <dependency>
@@ -36,23 +34,25 @@
             <artifactId>jdom</artifactId>
             <version>1.0</version>
         </dependency>
-		<dependency>
-		 <groupId>saxpath</groupId>		
-		  <artifactId>saxpath</artifactId>
-		  <version>1.0-FCS</version>
-		</dependency>
-		  <dependency>
-		  <id>jaxen</id>
-		  <version>1.0-FCS-full</version>
-		  <properties>
-			<war.bundle>true</war.bundle>
-		  </properties>
-		</dependency>
+        <dependency>
+            <groupId>saxpath</groupId>
+            <artifactId>saxpath</artifactId>
+            <version>1.0-FCS</version>
+        </dependency>
+        <dependency>
+            <id>jaxen</id>
+            <version>1.0-FCS-full</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
 
         <dependency>
-          <id>jetspeed2:jetspeed-api</id>
-          <version>&jetspeed-version;</version>
-        </dependency>	
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
     </dependencies>
 
     <build>

Modified: portals/jetspeed-2/trunk/components/file-cache/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/file-cache/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,41 +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:ant="jelly:ant">
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:ant="jelly:ant">
+
+    <!-- Target of maven test:single test -->
+    <property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator' />
 
-  <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator'/> 
-  
-   <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>

Modified: portals/jetspeed-2/trunk/components/file-cache/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/file-cache/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/project.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/project.xml Tue Jul 12 17:40:07 2005
@@ -3,107 +3,110 @@
   <!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-file-cache</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 File Cache</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Jetspeed File Cache
-  </description>
-  <shortDescription>File Cache</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/file-cache</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/file-cache</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/file-cache/</url>
-  </repository>
-
-  <dependencies>
-  	 &spring-deps;
-    <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>
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
-    
-  </build>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-file-cache</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 File Cache</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Jetspeed File Cache</description>
+    <shortDescription>File Cache</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/file-cache</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/file-cache
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/file-cache/</url>
+    </repository>
+
+    <dependencies>
+        &spring-deps;
+        <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>
+
+                &log4j-resources;
+
+            </resources>
+        </unitTest>
 
-  <reports>
-    
-    &j2-reports;
-    
-  </reports>  
+    </build>
+
+    <reports>
+
+        &j2-reports;
+
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/id-generator/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/id-generator/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,28 +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">
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define">
 
-  <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator'/> 
-  
-   <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.idgenerator.TestIdGenerator' />
 
 </project>

Modified: portals/jetspeed-2/trunk/components/id-generator/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/id-generator/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/project.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/project.xml Tue Jul 12 17:40:07 2005
@@ -3,99 +3,105 @@
   <!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-id-generator</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 ID Generator</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Jetspeed ID Generator
-  </description>
-  <shortDescription>ID Generator</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/id-generator</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/id-generator</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/id-generator/</url>
-  </repository>
-
-  <dependencies>
-  	&spring-deps;
-  	<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>junit</id>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <id>log4j</id>
-      <version>1.2.8</version>
-    </dependency>y> 
-  </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>
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
-    
-  </build>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-id-generator</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 ID Generator</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Jetspeed ID Generator</description>
+    <shortDescription>ID Generator</shortDescription>
+
+    <repository>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/id-generator
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/id-generator
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/id-generator/</url>
+    </repository>
+
+    <dependencies>
+        &spring-deps;
+        <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>junit</id>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
+            <id>log4j</id>
+            <version>1.2.8</version>
+        </dependency>
+        y>
+    </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>
+
+                &log4j-resources;
+
+            </resources>
+        </unitTest>
 
-  <reports>
-    
-    &j2-reports;
-    
-  </reports>  
+    </build>
+
+    <reports>
+
+        &j2-reports;
+
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/jetspeed/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/jetspeed/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,39 +1,32 @@
+<?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.idgenerator.TestIdGenerator'/>
-
-   <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>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
 
-  <preGoal name="test:test">
-    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
-    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
-    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
-    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+    <!-- Target of maven test:single test -->
+    <property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator' />
 
-    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
-    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
-  </preGoal>
+    <preGoal name="test:test">
+        <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}" />
+        <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}" />
+        <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}" />
+        <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}" />
+
+        <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}" />
+        <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path" />
+    </preGoal>
 
 </project>

Modified: portals/jetspeed-2/trunk/components/jetspeed/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/jetspeed/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/project.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/project.xml Tue Jul 12 17:40:07 2005
@@ -3,145 +3,146 @@
   <!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-components</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Components</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Jetspeed Components
-  </description>
-  <shortDescription>Jetspeed Components</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/jetspeed</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/jetspeed</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/jetspeed/</url>
-  </repository>
-
-  <dependencies>
-  	&spring-deps;
-  	&commons-config-dep;
-  	<dependency>
-      <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-      <id>portlet-api</id>
-      <version>1.0</version>
-    </dependency>
-
-    <dependency>
-      <id>commons-httpclient</id>
-      <version>2.0</version>
-    </dependency>
-	
-    <dependency>
-      <id>jetspeed-cm</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</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>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>castor</id>
-      <version>0.9.4.3</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
+    Copyright 2004 The Apache Software Foundation
     
-    <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>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>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <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>
+    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
     
-  </build>
-
-  <reports>
+    http://www.apache.org/licenses/LICENSE-2.0
     
-    &j2-reports;
+    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.
     
-  </reports>  
+    $Id$
+-->
+<project>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-components</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Components</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Jetspeed Components</description>
+    <shortDescription>Jetspeed Components</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/jetspeed</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/jetspeed
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/jetspeed/</url>
+    </repository>
+
+    <dependencies>
+        &spring-deps;
+        &commons-config-dep;
+        <dependency>
+            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
+            <id>portlet-api</id>
+            <version>1.0</version>
+        </dependency>
+
+        <dependency>
+            <id>commons-httpclient</id>
+            <version>2.0</version>
+        </dependency>
+
+        <dependency>
+            <id>jetspeed-cm</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </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>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>castor</id>
+            <version>0.9.4.3</version>
+            <properties>
+                <war.bundle>true</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>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>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <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>
 </project>

Modified: portals/jetspeed-2/trunk/components/locator/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/locator/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,26 +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">
-
-   
-   <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>
-
-</project>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" />

Modified: portals/jetspeed-2/trunk/components/locator/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/locator/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/project.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/project.xml Tue Jul 12 17:40:07 2005
@@ -3,99 +3,101 @@
   <!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-locator</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Template Locator</name>
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Jetspeed Locator provides a transparent mechanism to locate resources
-	  on the file system.
-  </description>
-  <shortDescription>Helps locate resources on the file system.</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/locator</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/locator</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/locator/</url>
-  </repository>
-
-  <dependencies>
-  	&spring-deps;
-    <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>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>
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
-    
-  </build>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-locator</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Template Locator</name>
+    <package>org.apache.jetspeed</package>
+    <description>Jetspeed Locator provides a transparent mechanism to locate resources on the file system.</description>
+    <shortDescription>Helps locate resources on the file system.</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/locator</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/locator
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/locator/</url>
+    </repository>
+
+    <dependencies>
+        &spring-deps;
+        <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>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>
+
+                &log4j-resources;
+
+            </resources>
+        </unitTest>
+
+    </build>
+
+    <reports>
+
+        &j2-reports;
 
-  <reports>
-  
-  	&j2-reports;
-  
-  </reports>  
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/page-manager/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,43 +1,34 @@
+<?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' />
+
+    <preGoal name="test:test">
+        <copy todir="target/testdata">
+            <fileset dir="testdata"></fileset>
+        </copy>
+    </preGoal>
 
-   <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>
-  
-  <preGoal name="test:test">
-  	   <copy todir="target/testdata">
-        <fileset dir="testdata">
-       </fileset>
-    </copy>
-  </preGoal>
-  
     <preGoal name="test:single">
-  	   <copy todir="target/testdata">
-        <fileset dir="testdata">
-       </fileset>
-    </copy>
-  </preGoal>
-  	
+        <copy todir="target/testdata">
+            <fileset dir="testdata"></fileset>
+        </copy>
+    </preGoal>
+
 
 </project>

Modified: portals/jetspeed-2/trunk/components/page-manager/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/project.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/project.xml Tue Jul 12 17:40:07 2005
@@ -3,239 +3,261 @@
   <!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-page-manager</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Page Manager</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Page management implementations.
-  </description>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/page-manager</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/page-manager</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/page-manager/</url>
-  </repository>
-
-  <shortDescription>Page Manager</shortDescription>
-  <dependencies>
-  
-  	&spring-deps;
-  	
-  	&db-ojb-deps;
-  	
-  	&commons-config-dep;
-  	
-   	<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-file-cache</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-id-generator</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>
-    <dependency>
-      <id>jetspeed2:jetspeed-profiler</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>
- 
+    Copyright 2004 The Apache Software Foundation
     
-    <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>
+    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
     
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    
-  </build>
-  <reports>
+    http://www.apache.org/licenses/LICENSE-2.0
     
-    &j2-reports;
+    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.
     
-  </reports>  
+    $Id$
+-->
+<project>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-page-manager</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Page Manager</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Page management implementations.</description>
+
+    <repository>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/page-manager
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/page-manager
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/page-manager/</url>
+    </repository>
+
+    <shortDescription>Page Manager</shortDescription>
+    <dependencies>
+
+        &spring-deps;
+
+        &db-ojb-deps;
+
+        &commons-config-dep;
+
+        <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-file-cache</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-id-generator</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>
+        <dependency>
+            <id>jetspeed2:jetspeed-profiler</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/persistence/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/persistence/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/persistence/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/persistence/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>



---------------------------------------------------------------------
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