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 [3/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/rdbms/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/project.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/project.xml Tue Jul 12 17:40:07 2005
@@ -3,153 +3,155 @@
   <!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-rdbms</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 RDBMS Components</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  RDBMS Components
-  </description>
-  <shortDescription>RDBMS Components</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rdbms/</url>
-  </repository>
-
-  <dependencies>  
-  	&spring-deps;
-  	<dependency>
-      <id>jetspeed-cm</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</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>tyrex</id>
-      <version>1.0.1</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-     <dependency>
-      <id>hsqldb</id>
-      <version>1.7.1</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-collections</id>
-      <version>3.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jta</id>
-      <jar>jta1.0.1.jar</jar>
-      <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>
+    Copyright 2004 The Apache Software Foundation
     
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    <unitTest>
-       <includes>
-        <include>**/Test*.java</include>
-      </includes>
-      <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
     
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
+    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.
     
-  </build>
-  <reports>
-  
-  	&j2-reports;
-  
-  </reports>  
+    $Id$
+-->
+<project>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-rdbms</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 RDBMS Components</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>RDBMS Components</description>
+    <shortDescription>RDBMS Components</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rdbms/</url>
+    </repository>
+
+    <dependencies>
+        &spring-deps;
+        <dependency>
+            <id>jetspeed-cm</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </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>tyrex</id>
+            <version>1.0.1</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>hsqldb</id>
+            <version>1.7.1</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-collections</id>
+            <version>3.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jta</id>
+            <jar>jta1.0.1.jar</jar>
+            <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>
+
+    </dependencies>
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+        <unitTest>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
+                </resource>
+            </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/registry/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,39 +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.
--->
-<project default="java:jar"
-         xmlns:j="jelly:core" 
-         xmlns:define="jelly:define"
-         xmlns:maven="jelly:maven">
-
-<!--
-  <preGoal name="test:test">
-  	<attainGoal name="db.recreate"/>
-  </preGoal>
-<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/> 
-<property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/> 
-
--->  
-<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirectPart1a'/> 
-
     
+    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">
 
-  <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" verbose="true"/>
-  </goal>
-
+    <property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirectPart1a' />
 
 </project>

Modified: portals/jetspeed-2/trunk/components/registry/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/project.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/project.xml Tue Jul 12 17:40:07 2005
@@ -3,294 +3,308 @@
   <!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-registry</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Registry Components</name>
 
-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
+    <package>org.apache.jetspeed</package>
+    <description>Registry Components</description>
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/registry</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/registry
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/registry/</url>
+    </repository>
 
-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.
+    <shortDescription>Registry Components</shortDescription>
+    <dependencies>
 
-  $Id$
--->
-<project>
-  <extend>${basedir}/../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed-registry</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Registry Components</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Registry Components
-  </description>
-
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/registry</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/registry</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/registry/</url>
-  </repository>
-
-  <shortDescription>Registry Components</shortDescription>
-  <dependencies>
-  
-  	&spring-deps;
-  	
-  	&db-ojb-deps;
-  	
-  	&jmock-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>
-    <dependency>
-      <id>jetspeed-prefs</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jetspeed2:jetspeed-portlet-factory</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>
-      <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-configuration</id>
-      <version>1.0-dev</version>
-      <properties>
-        <war.bundle>false</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>hsqldb</id>
-      <version>1.7.1</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>    
-    <dependency>
-      <id>jetspeed-commons</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-       
-      &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>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>
-       <excludes>
-        <exclude>**/Abstract*</exclude>
-
-      </excludes>
-      <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>  
+        &spring-deps;
+
+        &db-ojb-deps;
+
+        &jmock-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>
+        <dependency>
+            <id>jetspeed-prefs</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-portlet-factory</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>
+            <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-configuration</id>
+            <version>1.0-dev</version>
+            <properties>
+                <war.bundle>false</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>hsqldb</id>
+            <version>1.7.1</version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed-commons</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+
+        &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>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>
+            <excludes>
+                <exclude>**/Abstract*</exclude>
+
+            </excludes>
+            <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/rewriter/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rewriter/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,27 +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: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>
-
-
-</project>
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven" />

Modified: portals/jetspeed-2/trunk/components/rewriter/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rewriter/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/project.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/project.xml Tue Jul 12 17:40:07 2005
@@ -3,122 +3,122 @@
   <!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-rewriter</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Rewriter Component</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Rewriter Component
-  </description>
-  <shortDescription>Rewriter Components</shortDescription>
-
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rewriter</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rewriter</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rewriter/</url>
-  </repository>
-
-  <dependencies>
-  	<dependency>
-      <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-      <id>portlet-api</id>
-      <version>1.0</version>
-    </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>nekohtml</id>
-      <version>0.9.3</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>commons-httpclient</id>
-      <version>2.0</version>
-    </dependency>
+    <extend>${basedir}/../../project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <artifactId>jetspeed-rewriter</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Rewriter Component</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Rewriter Component</description>
+    <shortDescription>Rewriter Components</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rewriter</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rewriter
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rewriter/</url>
+    </repository>
+
+    <dependencies>
+        <dependency>
+            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
+            <id>portlet-api</id>
+            <version>1.0</version>
+        </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>nekohtml</id>
+            <version>0.9.3</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>commons-httpclient</id>
+            <version>2.0</version>
+        </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>
-          </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>  
+    <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>
+                    </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/search/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/search/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/search/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/search/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.search.TestSearch' />
 
-   <property name='testcase' value='org.apache.jetspeed.search.TestSearch'/> 
-  
-   <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/search/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/search/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/search/project.xml (original)
+++ portals/jetspeed-2/trunk/components/search/project.xml Tue Jul 12 17:40:07 2005
@@ -3,158 +3,162 @@
   <!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-search</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Search Component</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Search component for Jetspeed.
-  </description>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/search</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/search</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/search/</url>
-  </repository>
-
-  <shortDescription>Search</shortDescription>
-  <dependencies>  
+    Copyright 2004 The Apache Software Foundation
     
-    &commons-config-dep;
-  	<dependency>
-      <id>jetspeed-api</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>commons-httpclient</id>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <id>lucene</id>
-      <version>1.4.1</version>
-    </dependency>
+    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
     
-    <!-- Testing only -->
-    <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>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>
-      
-      &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>
-      <includes>
-        <include>**/Test*.java</include>
-      </includes>
-      <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>
-        
-        &log4j-resources;
-        
-      </resources>
-    </unitTest>
-    
-    <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-search</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Search Component</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Search component for Jetspeed.</description>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/search</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/search
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/search/</url>
+    </repository>
+
+    <shortDescription>Search</shortDescription>
+    <dependencies>
+
+        &commons-config-dep;
+        <dependency>
+            <id>jetspeed-api</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>commons-httpclient</id>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <id>lucene</id>
+            <version>1.4.1</version>
+        </dependency>
+
+
+        <!-- Testing only -->
+        <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>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>
+
+        &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>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+            <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>
+
+                &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/security/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/security/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,31 +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.security.TestAuthenticationProviderProxy'/>
-
- 
-  <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">
 
+    <!-- Target of maven test:single test -->
+    <property name='testcase' value='org.apache.jetspeed.security.TestAuthenticationProviderProxy' />
+    
 </project>

Modified: portals/jetspeed-2/trunk/components/security/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/project.xml (original)
+++ portals/jetspeed-2/trunk/components/security/project.xml Tue Jul 12 17:40:07 2005
@@ -3,277 +3,289 @@
   <!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-security</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Security Components</name>
 
-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
+    <package>org.apache.jetspeed</package>
+    <description>Security Components</description>
+    <shortDescription>Security Components</shortDescription>
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/security/</url>
+    </repository>
 
-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.
+    <dependencies>
 
-  $Id$
--->
-<project>
-  <extend>${basedir}/../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed-security</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Security Components</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Security Components
-  </description>
-  <shortDescription>Security Components</shortDescription>
-
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/security/</url>
-  </repository>
-
-  <dependencies>
-  
-  	&spring-deps;
-  	
-  	&db-ojb-deps;
-  	
-  	&commons-config-dep;
-
-	<!-- Components -->
-	<dependency>
-      <id>jetspeed-api</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-  	<dependency>
-      <id>jetspeed-cm</id>
-      <groupId>jetspeed2</groupId>
-      <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>
-    <dependency>
-      <id>jetspeed-prefs</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>
-      <!-- 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>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>
-    <dependency>
-      <id>commons-codec</id>
-      <version>1.3</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>
-      <excludes>
-        <exclude>**/ldap/*</exclude>
-      </excludes>
-
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</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>  
+        &spring-deps;
+
+        &db-ojb-deps;
+
+        &commons-config-dep;
+
+        <!-- Components -->
+        <dependency>
+            <id>jetspeed-api</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>jetspeed-cm</id>
+            <groupId>jetspeed2</groupId>
+            <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>
+        <dependency>
+            <id>jetspeed-prefs</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>
+            <!-- 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>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>
+        <dependency>
+            <id>commons-codec</id>
+            <version>1.3</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>
+            <excludes>
+                <exclude>**/ldap/*</exclude>
+            </excludes>
+
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <excludes>
+                        <exclude>**/*.java</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/sso/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,31 +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.sso.TestSSOComponent'/>
-
- 
-  <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">
 
+    <!-- Target of maven test:single test -->
+    <property name='testcase' value='org.apache.jetspeed.sso.TestSSOComponent' />
 
 </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