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 [4/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/sso/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/project.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/project.xml Tue Jul 12 17:40:07 2005
@@ -3,296 +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-sso</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Single Sign On Components</name>
+
+    <package>org.apache.jetspeed</package>
+    <description>Single Sign On SSO Components</description>
+    <shortDescription>Single Sign On SSO Components</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/sso</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/sso
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/sso/</url>
+    </repository>
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+    <dependencies>
 
-    http://www.apache.org/licenses/LICENSE-2.0
+        &spring-deps;
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+        &db-ojb-deps;
 
-  $Id$
--->
-<project>
-  <extend>${basedir}/../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>jetspeed-sso</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Single Sign On Components</name>
-  
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Single Sign On SSO Components
-  </description>
-  <shortDescription>Single Sign On SSO Components</shortDescription>
-
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/sso</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/sso</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/sso/</url>
-  </repository>
-
-  <dependencies>
-  
-  	&spring-deps;
-  	
-  	&db-ojb-deps;
-  	
-  	&commons-config-dep;
-
-    <dependency>
-      <id>commons-httpclient</id>
-      <version>2.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-
-	<!-- Components -->
-	<!-- Servlet API -->
-	<dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
-       </dependency>
-       
-    <!-- Security implementation -->
-    <dependency>
-      <id>jetspeed-security</id>
-      <groupId>jetspeed2</groupId>
-      <version>&jetspeed-version;</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    
-	
-	<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>
-    
+        &commons-config-dep;
 
-    <!-- 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>b10</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>**/TestSSOComponent.java</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>  
+        <dependency>
+            <id>commons-httpclient</id>
+            <version>2.0</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <!-- Components -->
+        <!-- Servlet API -->
+        <dependency>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        <!-- Security implementation -->
+        <dependency>
+            <id>jetspeed-security</id>
+            <groupId>jetspeed2</groupId>
+            <version>
+                &jetspeed-version;
+            </version>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+
+
+        <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>
+
+
+        <!-- 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>b10</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>**/TestSSOComponent.java</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/web-content/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/web-content/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,28 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
-<project default="java:jar"
-         xmlns:j="jelly:core" 
-         xmlns:define="jelly:define">
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define">
+
+    <property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent' />
 
-   <property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/> 
-  
-   <goal name="deployJar">
-    <property name='maven.test.skip' value='true'/> 
-  	<attainGoal name="jar:install"/>
-  	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib"/>
-  </goal>
-  
 </project>

Modified: portals/jetspeed-2/trunk/components/web-content/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/web-content/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/project.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/project.xml Tue Jul 12 17:40:07 2005
@@ -3,192 +3,204 @@
   <!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-web-content</id>
-  <groupId>jetspeed2</groupId>
-  <name>Jetspeed-2 Web Content</name>
-  <package>org.apache.jetspeed</package>
-  <description>
-	  Web content service and portlet implementations.
-  </description>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/web-content</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/web-content</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/web-content/</url>
-  </repository>
-
-  <shortDescription>Web Content</shortDescription>
-  <dependencies>  
-  
-  	&spring-deps;
-  	&commons-config-dep;
-  	
-  	<dependency>
-      <id>jetspeed2:jetspeed-rewriter</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
- 
-  	<dependency>
-      <id>jetspeed2:jetspeed-components</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-   	<dependency>
-      <id>jetspeed2:jetspeed-commons</id>
-      <version>&jetspeed-version;</version>
-    </dependency>
-   	<dependency>
-      <id>jetspeed2:jetspeed-api</id>
-      <version>&jetspeed-version;</version>
-    </dependency>	
-    <dependency>
-      <id>commons-httpclient</id>
-      <version>2.0</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>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>
-      
-      &pluto-deps;
-      
-    <dependency>
-      <id>velocity</id>
-      <version>1.4</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency>
-    <dependency>
-      <id>velocity-tools</id>
-      <version>1.1</version>
-      <url>http://jakarta.apache.org/velocity</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>      
-    </dependency>    
-	<dependency>
-		<groupId>portals-bridges</groupId>
-		<artifactId>portals-bridges-common</artifactId>
-		<version>&portals-bridges-common-version;</version>
-		<type>jar</type>
-		<properties>
-			<war.bundle>false</war.bundle>
-		</properties>
-	</dependency>	
-    <dependency>
-      <groupId>portals-bridges</groupId>
-      <artifactId>portals-bridges-velocity</artifactId>
-      <version>&portals-bridges-velocity-version;</version>
-      <properties>
-        <war.bundle>true</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>
-    </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>
-        
-        &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>
+    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-web-content</artifactId>
+    <groupId>jetspeed2</groupId>
+    <name>Jetspeed-2 Web Content</name>
+    <package>org.apache.jetspeed</package>
+    <description>Web content service and portlet implementations.</description>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/web-content</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/web-content
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/web-content/</url>
+    </repository>
+
+    <shortDescription>Web Content</shortDescription>
+    <dependencies>
+
+        &spring-deps;
+        &commons-config-dep;
+
+        <dependency>
+            <id>jetspeed2:jetspeed-rewriter</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+
+        <dependency>
+            <id>jetspeed2:jetspeed-components</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-commons</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>jetspeed2:jetspeed-api</id>
+            <version>
+                &jetspeed-version;
+            </version>
+        </dependency>
+        <dependency>
+            <id>commons-httpclient</id>
+            <version>2.0</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>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>
+
+        &pluto-deps;
+
+        <dependency>
+            <id>velocity</id>
+            <version>1.4</version>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <id>velocity-tools</id>
+            <version>1.1</version>
+            <url>http://jakarta.apache.org/velocity</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>
+                &portals-bridges-common-version;
+            </version>
+            <type>jar</type>
+            <properties>
+                <war.bundle>false</war.bundle>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>portals-bridges</groupId>
+            <artifactId>portals-bridges-velocity</artifactId>
+            <version>
+                &portals-bridges-velocity-version;
+            </version>
+            <properties>
+                <war.bundle>true</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>
+        </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>
+
+                &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/content-server/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/content-server/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/content-server/maven.xml (original)
+++ portals/jetspeed-2/trunk/content-server/maven.xml Tue Jul 12 17:40:07 2005
@@ -1,32 +1,25 @@
+<?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"/>
+<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>
-  
-  <goal name="deployWar">
-  	<attainGoal name="war"/>
-    <delete dir="${org.apache.jetspeed.deploy.war.dir}/${pom.artifactId}"/>
-  	<copy file="${basedir}/target/${maven.war.final.name}" todir="${org.apache.jetspeed.deploy.war.dir}"/>
-  </goal>
+    <goal name="deployWar">
+        <attainGoal name="war" />
+        <delete dir="${org.apache.jetspeed.deploy.war.dir}/${pom.artifactId}" />
+        <copy file="${basedir}/target/${maven.war.final.name}" todir="${org.apache.jetspeed.deploy.war.dir}" />
+    </goal>
 
 </project>

Modified: portals/jetspeed-2/trunk/content-server/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/content-server/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/content-server/project.xml (original)
+++ portals/jetspeed-2/trunk/content-server/project.xml Tue Jul 12 17:40:07 2005
@@ -22,7 +22,8 @@
 <project>
   <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>content-server</id>
+  <artifactId>content-server</artifactId>
+  <groupId>jetspeed2</groupId>
   <name>Jetspeed-2 Enterprise Portal Content Server</name>
   <package>org.apache.jetspeed</package>
   <description>

Modified: portals/jetspeed-2/trunk/design-docs/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/design-docs/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/design-docs/project.xml (original)
+++ portals/jetspeed-2/trunk/design-docs/project.xml Tue Jul 12 17:40:07 2005
@@ -3,77 +3,80 @@
   <!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>
-  <id>jetspeed2-design-docs</id>
-  <name>Jetspeed-2 Enterprise Portal Design Documentation</name>
-
-  <description>
-    Jetspeed is an Open Source implementation of an Enterprise Information 
-    Portal, using Java and XML.
-  </description>
-  <shortDescription>Enterprise Information Portal</shortDescription>
-
-  <repository>                 
-    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/design-docs</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/design-docs</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/design-docs/</url>
-  </repository>
-
-  <dependencies>
-    <dependency> <!-- Required by FOP v0.20.3 -->
-      <id>avalon-framework</id>
-      <version>4.1.3</version>
-    </dependency>   
-    <dependency> <!-- Required by FOP v0.20.3 -->
-      <id>batik</id>
-      <version>1.1.1</version>
-    </dependency>   
-    <dependency> <!-- Required by FOP v0.20.3 -->
-      <id>logkit</id>
-      <version>1.0.1</version>
-    </dependency>   
-    <dependency>
-      <id>fop</id>
-      <version>0.20.3</version>
-    </dependency>
-    <dependency>
-      <id>xml-apis</id>
-      <version>2.0.2</version>
-    </dependency>
-    <dependency>
-      <id>xerces</id>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <id>xalan</id>
-      <version>2.4.1</version>
-    </dependency>
-   </dependencies>
-
-  <build/>
-  <reports>
-    <report>maven-changelog-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-tasklist-plugin</report>
-  </reports>  
+    <extend>${basedir}/../project.xml</extend>
+    <artifactId>jetspeed2-design-docs</artifactId>
+    <groupId>jetspeed2</groupId>
+
+    <name>Jetspeed-2 Enterprise Portal Design Documentation</name>
+
+    <description>
+        Jetspeed is an Open Source implementation of an Enterprise Information Portal, using Java and XML.
+    </description>
+    <shortDescription>Enterprise Information Portal</shortDescription>
+
+    <repository>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/design-docs</connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/design-docs
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/design-docs/</url>
+    </repository>
+
+    <dependencies>
+        <dependency><!-- Required by FOP v0.20.3 -->
+            <id>avalon-framework</id>
+            <version>4.1.3</version>
+        </dependency>
+        <dependency><!-- Required by FOP v0.20.3 -->
+            <id>batik</id>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency><!-- Required by FOP v0.20.3 -->
+            <id>logkit</id>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <id>fop</id>
+            <version>0.20.3</version>
+        </dependency>
+        <dependency>
+            <id>xml-apis</id>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <id>xerces</id>
+            <version>2.2.1</version>
+        </dependency>
+        <dependency>
+            <id>xalan</id>
+            <version>2.4.1</version>
+        </dependency>
+    </dependencies>
+
+    <build />
+    <reports>
+        <report>maven-changelog-plugin</report>
+        <report>maven-file-activity-plugin</report>
+        <report>maven-developer-activity-plugin</report>
+        <report>maven-license-plugin</report>
+        <report>maven-linkcheck-plugin</report>
+        <report>maven-tasklist-plugin</report>
+    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/commons-config-dep.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/commons-config-dep.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/commons-config-dep.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/commons-config-dep.xml Tue Jul 12 17:40:07 2005
@@ -1,7 +1,7 @@
 <dependency>
-  <id>commons-configuration</id>
-  <version>1.0</version>
-  <properties>
-     <war.bundle>true</war.bundle>
-  </properties>
+    <id>commons-configuration</id>
+    <version>1.0</version>
+    <properties>
+        <war.bundle>true</war.bundle>
+    </properties>
 </dependency>

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/db-ojb-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/db-ojb-deps.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/db-ojb-deps.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/db-ojb-deps.xml Tue Jul 12 17:40:07 2005
@@ -1,7 +1,7 @@
 <dependency>
-	<id>ojb:db-ojb</id>
+    <id>ojb:db-ojb</id>
     <version>1.0.1</version>
     <properties>
-    	<war.bundle>true</war.bundle>
+        <war.bundle>true</war.bundle>
     </properties>
 </dependency>

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/jmock-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/jmock-deps.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/jmock-deps.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/jmock-deps.xml Tue Jul 12 17:40:07 2005
@@ -1,7 +1,7 @@
 <dependency>
-  <id>jmock</id>
-   <version>SNAPSHOT</version>
-   <properties>
-     <war.bundle>false</war.bundle>
-   </properties>
+    <id>jmock</id>
+    <version>SNAPSHOT</version>
+    <properties>
+        <war.bundle>false</war.bundle>
+    </properties>
 </dependency>

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/jsf-api-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/jsf-api-deps.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/jsf-api-deps.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/jsf-api-deps.xml Tue Jul 12 17:40:07 2005
@@ -3,6 +3,6 @@
     <artifactId>myfaces-jsf-api</artifactId>
     <version>1.0.9</version>
     <properties>
-		<war.bundle>true</war.bundle>
-	</properties>
+        <war.bundle>true</war.bundle>
+    </properties>
 </dependency>

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/jsf-bridge-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/jsf-bridge-deps.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/jsf-bridge-deps.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/jsf-bridge-deps.xml Tue Jul 12 17:40:07 2005
@@ -1,8 +1,10 @@
 <dependency>
     <groupId>portals-bridges</groupId>
     <artifactId>portals-bridges-jsf</artifactId>
-    <version>&portals-bridges-jsf-version;</version>
+    <version>
+        &portals-bridges-jsf-version;
+    </version>
     <properties>
-		<war.bundle>true</war.bundle>
+        <war.bundle>true</war.bundle>
     </properties>
 </dependency>

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/myfaces-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/myfaces-deps.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/myfaces-deps.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/myfaces-deps.xml Tue Jul 12 17:40:07 2005
@@ -3,8 +3,8 @@
     <artifactId>myfaces</artifactId>
     <version>1.0.9</version>
     <properties>
-		<war.bundle>true</war.bundle>
-	</properties>
+        <war.bundle>true</war.bundle>
+    </properties>
 </dependency>
 
 <dependency>
@@ -12,6 +12,6 @@
     <artifactId>myfaces-jsf-api</artifactId>
     <version>1.0.9</version>
     <properties>
-		<war.bundle>true</war.bundle>
-	</properties>
+        <war.bundle>true</war.bundle>
+    </properties>
 </dependency>

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/pluto-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/pluto-deps.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/pluto-deps.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/pluto-deps.xml Tue Jul 12 17:40:07 2005
@@ -1,9 +1,11 @@
 <dependency>
-  <groupId>pluto</groupId>
-  <artifactId>pluto</artifactId>
-  <version>&pluto-version;</version>
-  <type>jar</type>
-  <properties>
-    <war.bundle>false</war.bundle>
-  </properties>
+    <groupId>pluto</groupId>
+    <artifactId>pluto</artifactId>
+    <version>
+        &pluto-version;
+    </version>
+    <type>jar</type>
+    <properties>
+        <war.bundle>false</war.bundle>
+    </properties>
 </dependency>

Modified: portals/jetspeed-2/trunk/etc/project-dependencies/spring-deps.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/project-dependencies/spring-deps.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/project-dependencies/spring-deps.xml (original)
+++ portals/jetspeed-2/trunk/etc/project-dependencies/spring-deps.xml Tue Jul 12 17:40:07 2005
@@ -1,28 +1,28 @@
-    <dependency>
-      <id>cglib</id>
-      <version>full-2.0.2</version>
-      <properties>
+<dependency>
+    <id>cglib</id>
+    <version>full-2.0.2</version>
+    <properties>
         <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>springframework:spring</id>
-      <version>1.1.5</version>
-      <properties>
+    </properties>
+</dependency>
+<dependency>
+    <id>springframework:spring</id>
+    <version>1.1.5</version>
+    <properties>
         <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>   
-    <dependency>
-      <id>aopalliance</id>
-      <version>1.0</version>
-      <properties>
+    </properties>
+</dependency>
+<dependency>
+    <id>aopalliance</id>
+    <version>1.0</version>
+    <properties>
         <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>oro</id>
-      <version>2.0.7</version>
-      <properties>
+    </properties>
+</dependency>
+<dependency>
+    <id>oro</id>
+    <version>2.0.7</version>
+    <properties>
         <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
\ No newline at end of file
+    </properties>
+</dependency>
\ No newline at end of file

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

Modified: portals/jetspeed-2/trunk/jetspeed-api/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/project.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/project.xml Tue Jul 12 17:40:07 2005
@@ -22,13 +22,13 @@
 <project>
 <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
-  <id>jetspeed-api</id>
+  <artifactId>jetspeed-api</artifactId>
   <groupId>jetspeed2</groupId>
   <name>Jetspeed-2 Core API</name>
   
   <package>org.apache.jetspeed</package>
   <description>
-	  Core API for implmeneting Jetspeed
+	  Core API for implemeneting Jetspeed
   </description>
   <shortDescription>Helps locate resources on the file system.</shortDescription>
 

Modified: portals/jetspeed-2/trunk/layout-portlets/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/project.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/project.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/project.xml Tue Jul 12 17:40:07 2005
@@ -21,7 +21,7 @@
 -->
 <project>
     <extend>${basedir}/../project.xml</extend>
-    <id>jetspeed-layouts</id>
+    <artifactId>jetspeed-layouts</artifactId>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Layout Portlets</name>
     <description>Layout Portlets</description>

Modified: portals/jetspeed-2/trunk/maven-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/maven.xml?rev=216052&r1=216051&r2=216052&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/maven.xml Tue Jul 12 17:40:07 2005
@@ -26,6 +26,9 @@
         <copy file="../etc/artifact-versions.ent"
             tofile="${basedir}/target/classes/plugin-resources/etc/artifact-versions.ent" overwrite="true"
             failonerror="true" />
+        <copy todir="target/classes/plugin-resources/etc/db-ojb" overwrite="true" failonerror="true">
+            <fileset dir="../etc/db-ojb" />
+        </copy>
         <copy todir="target/classes/plugin-resources/etc/project-dependencies" overwrite="true" failonerror="true">
             <fileset dir="../etc/project-dependencies" />
         </copy>
@@ -39,40 +42,21 @@
             failonerror="true" />
         <copy file="../locator.path" tofile="${basedir}/target/classes/plugin-resources/locator.path" overwrite="true"
             failonerror="true" />
-        <attainGoal name="copyDb" />
-        <attainGoal name="copyPortlaWebApp" />
-        <copy file="../portal-webapp/project.xml" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml"
-            overwrite="true" failonerror="true" />
         <copy file="plugin.properties" tofile="${basedir}/target/classes/plugin.properties" overwrite="true"
             failonerror="true">
             <filterset begintoken="@" endtoken="@">
                 <filter token="JETSPEED_VERSION" value="&jetspeed-version;" />
+                <filter token="JETSPEED_GROUPID" value="${pom.groupId}" />
+                <filter token="PLUTO_VERSION" value="&pluto-version;" />
+                <filter token="PORTALS_BRIDGES_COMMON_VERSION" value="&portals-bridges-common-version;" />
             </filterset>
         </copy>
-
     </preGoal>
 
-
-
     <goal name="deploy-plugin">
-        <attainGoal name="undeploy-plugin" />
-
-        <!-- install will do the uninstall if needed for us -->
-        <attainGoal name="plugin:install" />
-        <!-- get the plugin available now (like with plugin:install-now, but which doesn't install).
-            Bug: If a new version of the plugin is deployed while an older version is available
-            maven gets very confused... Haven't found a workaround for that.
-        -->
-
-        <!-- deploy the plugin to the local repository directly: 
-            using the plugin:repository-install goal would lead to another build of the jar as all plugin goals do that as 
-            prereq
-        -->
-        <maven:installPlugin file="${maven.build.dir}/${maven.final.name}.jar" cache="true" />
-        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" type="plugin" project="${pom}" />
-        <unjar src="${maven.build.dir}/${maven.final.name}.jar" dest="${maven.home.local}/plugins/${maven.final.name}"
-            overwrite="true" />
-
+        <attainGoal name="clean" />
+        <attainGoal name="copyPortlaWebApp" />
+    	<attainGoal name="core-deploy-plugin" />
     </goal>
 
     <goal name="undeploy-plugin">
@@ -80,115 +64,49 @@
         <delete dir="${maven.home.local}/plugins/${maven.final.name}" verbose="false" />
     </goal>
 
-    <goal name="copyDb">
-        <copy todir="target/classes/plugin-resources" overwrite="true" failonerror="true">
-            <fileset dir="../src/database/hsql">
-                <include name="Empty.script" />
-                <include name="Production.properties" />
-            </fileset>
-        </copy>
-
-
-        <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
-            <fileset dir="../target/src/sql">
-                <exclude name="**/test-persistence-schema.sql" />
-                <include name="**/*.sql" />
-            </fileset>
-        </copy>
-
-        <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
-            <fileset dir="../src/sql/">
-                <include name="*.sql" />
-            </fileset>
-        </copy>
-
-        <copy todir="target/classes/plugin-resources/hsql/drop/" overwrite="true" failonerror="true">
-            <fileset dir="../src/sql/hsql/">
-                <include name="drop.sql" />
-            </fileset>
-        </copy>
-
-        <copy todir="target/classes/plugin-resources/mysql/drop/" overwrite="true" failonerror="true">
-            <fileset dir="../src/sql/mysql/">
-                <include name="drop.sql" />
-            </fileset>
-        </copy>
-
-        <copy todir="target/classes/plugin-resources/oracle/drop/" overwrite="true" failonerror="true">
-            <fileset dir="../src/sql/oracle/">
-                <include name="drop.sql" />
-            </fileset>
-        </copy>
-
-        <util:file name="${basedir}/../src/sql" var="sqlSrcDir" />
-        <j:forEach items="${sqlSrcDir.listFiles()}" var="sqlSrcDirFile">
-            <util:file name="${basedir}/../src/sql/${sqlSrcDirFile.name}/populate-userinfo-for-default-psml.sql"
-                var="dbSpecificPopulateScript" />
-            <j:if test="${dbSpecificPopulateScript.exists()}">
-                <copy file="${dbSpecificPopulateScript.absolutePath}"
-                    toDir="target/classes/plugin-resources/${sqlSrcDirFile.name}/populate" />
-            </j:if>
-        </j:forEach>
-
-        <!--
-            <move file="${basedir}/target/classes/plugin-resources/Empty.script" tofile="${basedir}/target/classes/plugin-resources/Production.script" overwrite="true"/>
-            <echo>Initializing HSQL Production.script with basic portal info.......</echo>
-            <j:set var="org.apache.jetspeed.database.url" value="jdbc:hsqldb:target/classes/plugin-resources/Production"/>
-            <j:set var="org.apache.jetspeed.database.driver" value="org.hsqldb.jdbcDriver"/>
-            <j:set var="org.apache.jetspeed.database.user" value="sa"/>
-            <j:set var="org.apache.jetspeed.database.password" value=""/>
-            <j:set var="org.apache.jetspeed.database.default.name" value="hsql" />
-            <attainGoal name="db.create" />	 
-        -->
-    </goal>
-
     <goal name="copyPortlaWebApp">
         <copy todir="target/classes/plugin-resources/webapp" overwrite="true" failonerror="true">
-            <fileset dir="../portal-webapp/src/webapp">
-                <exclude name="**/WEB-INF/pages/*" />
-            </fileset>
+            <fileset dir="../portal-webapp/src/webapp" />
         </copy>
         <copy todir="target/classes/plugin-resources/" overwrite="true" failonerror="true">
             <fileset dir="../portal-webapp/src/resources" />
         </copy>
         <copy file="${maven.repo.local}/${pom.groupId}/wars/jetspeed-layouts-&jetspeed-version;.war"
-            tofile="${org.apache.jetspeed.portal.dir}/WEB-INF/deploy/jetspeed-layouts.war" overwrite="true" failonerror="true" />
+            tofile="target/classes/plugin-resources/webapp/WEB-INF/deploy/jetspeed-layouts.war" overwrite="true" failonerror="true" />
+        <copy file="../portal-webapp/project.xml.template" tofile="${basedir}/target/classes/plugin-resources/portal_project.xml"
+            overwrite="true" failonerror="true">
+            <filterset begintoken="@" endtoken="@">
+                <filter token="GENAPP_GROUPID" value="${org.apache.jetspeed.genapp.groupId}" />
+                <filter token="GENAPP_ARTIFACTID" value="${org.apache.jetspeed.portal.name}" />
+                <filter token="GENAPP_NAME" value="${org.apache.jetspeed.genapp.name}" />
+                <filter token="GENAPP_CURRENT_VERSION" value="${org.apache.jetspeed.genapp.currentVersion}" />
+            </filterset>
+        </copy>
     </goal>
+    
+    <goal name="deploy-plugin-withoutwebapp">
+    	<attainGoal name="clean" />
+    	<attainGoal name="core-deploy-plugin" />
+    </goal>
+    
+    <goal name="core-deploy-plugin">
+    	<attainGoal name="undeploy-plugin" />
 
-    <goal name="db.execute">
-        <sql driver="${org.apache.jetspeed.database.driver}" url="${org.apache.jetspeed.database.url}"
-            userid="${org.apache.jetspeed.database.user}" password="${org.apache.jetspeed.database.password}"
-            src="${database.arg.script}">
-            <classpath>
-                <path refid="maven.dependency.classpath" />
-                <pathelement path="${org.apache.jetspeed.jdbc.drivers.path}" />
-            </classpath>
-        </sql>
-    </goal>
+		<!-- install will do the uninstall if needed for us -->
+        <attainGoal name="plugin:install" />
+        <!-- get the plugin available now (like with plugin:install-now, but which doesn't install).
+            Bug: If a new version of the plugin is deployed while an older version is available
+            maven gets very confused... Haven't found a workaround for that.
+        -->
 
-    <goal name="db.create">
-        <j:set var="database.arg.script"
-            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase3ojb-schema.sql" />
-        <attainGoal name="db.execute" />
-        <j:set var="database.arg.script"
-            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase1-schema.sql" />
-        <attainGoal name="db.execute" />
-        <j:set var="database.arg.script"
-            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/phase2-schema.sql" />
-        <attainGoal name="db.execute" />
-        <j:set var="database.arg.script"
-            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/registry-schema.sql" />
-        <attainGoal name="db.execute" />
-        <j:set var="database.arg.script"
-            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/prefs-schema.sql" />
-        <attainGoal name="db.execute" />
-        <j:set var="database.arg.script"
-            value="./target/classes/plugin-resources/${org.apache.jetspeed.database.default.name}/security-schema.sql" />
-        <attainGoal name="db.execute" />
-        <j:set var="database.arg.script" value="./target/classes/plugin-resources/populate-db-default.sql" />
-        <attainGoal name="db.execute" />
+        <!-- deploy the plugin to the local repository directly: 
+            using the plugin:repository-install goal would lead to another build of the jar as all plugin goals do that as 
+            prereq
+        -->
+        <maven:installPlugin file="${maven.build.dir}/${maven.final.name}.jar" cache="true" />
+        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" type="plugin" project="${pom}" />
+        <unjar src="${maven.build.dir}/${maven.final.name}.jar" dest="${maven.home.local}/plugins/${maven.final.name}"
+            overwrite="true" />
     </goal>
-
-
 
 </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