portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject svn commit: r216242 [1/3] - in /portals/jetspeed-2/trunk/components: capability/ cm/ deploy-tool/ file-cache/ id-generator/ jetspeed/ locator/ page-manager/ portal-site/ portal/ portal/src/java/org/apache/jetspeed/services/title/ portal/src/java/org/ap...
Date Wed, 13 Jul 2005 21:08:58 GMT
Author: weaver
Date: Wed Jul 13 14:08:55 2005
New Revision: 216242

URL: http://svn.apache.org/viewcvs?rev=216242&view=rev
Log:
SRP-304:
http://issues.apache.org/jira/browse/JS2-304#action_12315720

Added:
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java
Removed:
    portals/jetspeed-2/trunk/components/capability/locator.ent
    portals/jetspeed-2/trunk/components/capability/locator.path
    portals/jetspeed-2/trunk/components/cm/locator.ent
    portals/jetspeed-2/trunk/components/cm/locator.path
    portals/jetspeed-2/trunk/components/deploy-tool/locator.ent
    portals/jetspeed-2/trunk/components/deploy-tool/locator.path
    portals/jetspeed-2/trunk/components/file-cache/locator.ent
    portals/jetspeed-2/trunk/components/file-cache/locator.path
    portals/jetspeed-2/trunk/components/id-generator/locator.ent
    portals/jetspeed-2/trunk/components/id-generator/locator.path
    portals/jetspeed-2/trunk/components/jetspeed/locator.ent
    portals/jetspeed-2/trunk/components/jetspeed/locator.path
    portals/jetspeed-2/trunk/components/locator/locator.ent
    portals/jetspeed-2/trunk/components/locator/locator.path
    portals/jetspeed-2/trunk/components/page-manager/grep
    portals/jetspeed-2/trunk/components/page-manager/locator.ent
    portals/jetspeed-2/trunk/components/page-manager/locator.path
    portals/jetspeed-2/trunk/components/portal-site/locator.ent
    portals/jetspeed-2/trunk/components/portal-site/locator.path
    portals/jetspeed-2/trunk/components/portal/locator.ent
    portals/jetspeed-2/trunk/components/portal/locator.path
    portals/jetspeed-2/trunk/components/portlet-factory/locator.ent
    portals/jetspeed-2/trunk/components/portlet-factory/locator.path
    portals/jetspeed-2/trunk/components/prefs/locator.ent
    portals/jetspeed-2/trunk/components/prefs/locator.path
    portals/jetspeed-2/trunk/components/profiler/locator.ent
    portals/jetspeed-2/trunk/components/profiler/locator.path
    portals/jetspeed-2/trunk/components/rdbms/locator.ent
    portals/jetspeed-2/trunk/components/rdbms/locator.path
    portals/jetspeed-2/trunk/components/registry/locator.ent
    portals/jetspeed-2/trunk/components/registry/locator.path
    portals/jetspeed-2/trunk/components/rewriter/locator.ent
    portals/jetspeed-2/trunk/components/rewriter/locator.path
    portals/jetspeed-2/trunk/components/search/locator.ent
    portals/jetspeed-2/trunk/components/search/locator.path
    portals/jetspeed-2/trunk/components/security/locator.ent
    portals/jetspeed-2/trunk/components/security/locator.path
    portals/jetspeed-2/trunk/components/sso/locator.ent
    portals/jetspeed-2/trunk/components/sso/locator.path
    portals/jetspeed-2/trunk/components/web-content/locator.ent
    portals/jetspeed-2/trunk/components/web-content/locator.path
Modified:
    portals/jetspeed-2/trunk/components/capability/project.xml
    portals/jetspeed-2/trunk/components/cm/project.xml
    portals/jetspeed-2/trunk/components/deploy-tool/project.xml
    portals/jetspeed-2/trunk/components/file-cache/project.xml
    portals/jetspeed-2/trunk/components/id-generator/project.xml
    portals/jetspeed-2/trunk/components/jetspeed/project.xml
    portals/jetspeed-2/trunk/components/locator/project.xml
    portals/jetspeed-2/trunk/components/page-manager/project.xml
    portals/jetspeed-2/trunk/components/portal/   (props changed)
    portals/jetspeed-2/trunk/components/portal-site/project.xml
    portals/jetspeed-2/trunk/components/portal/project.xml
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
    portals/jetspeed-2/trunk/components/portlet-factory/project.xml
    portals/jetspeed-2/trunk/components/prefs/project.xml
    portals/jetspeed-2/trunk/components/profiler/project.xml
    portals/jetspeed-2/trunk/components/rdbms/project.xml
    portals/jetspeed-2/trunk/components/registry/project.xml
    portals/jetspeed-2/trunk/components/rewriter/project.xml
    portals/jetspeed-2/trunk/components/search/project.xml
    portals/jetspeed-2/trunk/components/security/project.xml
    portals/jetspeed-2/trunk/components/sso/project.xml
    portals/jetspeed-2/trunk/components/web-content/project.xml

Modified: portals/jetspeed-2/trunk/components/capability/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/capability/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/project.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/project.xml Wed Jul 13 14:08:55 2005
@@ -1,204 +1,177 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!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.
-    
+
+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-capability</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Capability Components</name>
-    <package>org.apache.jetspeed</package>
-    <description>
+  <extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <artifactId>jetspeed-capability</artifactId>
+  <name>Jetspeed-2 Capability Components</name>
+  <package>org.apache.jetspeed</package>
+  <description>
         Capability Components defines an api for "guessing" what client is accessing a web application by looking for
         clues in the request headers then return a list of that client's capabilites i.e. HTML 4.0, WML, Javascript 1.2,
         etc.
-    </description>
+  </description>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/capability</connection>
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/capability</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/capability
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/capability/</url>
-    </repository>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/capability/</url>
+  </repository>
 
-    <shortDescription>Capability Components</shortDescription>
-    <dependencies>
-
-        &spring-deps;
-
-        &db-ojb-deps;
-
-        &commons-config-dep;
-
-        <dependency>
-            <id>jetspeed-cm</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-commons</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-registry</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <!-- Testing only -->
-        <dependency>
-            <id>jetspeed2:jetspeed-rdbms</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>commons-beanutils</id>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <id>commons-configuration</id>
-            <version>1.0-dev</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.6</version>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <id>tyrex</id>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <id>jta</id>
-            <jar>jta1.0.1.jar</jar>
-        </dependency>
-
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-        </dependency>
-
-        <!-- This is only a test dependency -->
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-        </dependency>
-
-        &pluto-deps;
-
-        <dependency>
-            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-            <id>portlet-api</id>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/java</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                        <exclude>**/META-INF/**</exclude>
-                    </excludes>
-                </resource>
-
-                &db-ojb-resources;
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
+  <shortDescription>Capability Components</shortDescription>
+ 
+  <dependencies>  	
+  	<dependency>
+      <id>jetspeed-cm</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>  	  	
+   	<dependency>
+      <id>jetspeed2:jetspeed-commons</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-api</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-registry</id>
+      <version>${jetspeed.version}</version>
+    </dependency>    
+    <!-- Testing only -->
+    <dependency>
+      <id>jetspeed2:jetspeed-rdbms</id>
+      <version>${jetspeed.version}</version>
+    </dependency>    	
+  	 <dependency>
+      <id>commons-lang</id>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <id>commons-logging</id>
+      <version>1.0.3</version>
+    </dependency>
+    <dependency>
+      <id>commons-beanutils</id>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <id>commons-configuration</id>
+      <version>1.0-dev</version>
+    </dependency>
+    <dependency>
+      <id>junit</id>
+      <version>3.8.1</version>
+    </dependency>
+    <dependency>
+      <id>log4j</id>
+      <version>1.2.6</version>
+    </dependency>   
+    <dependency>
+      <id>commons-collections</id>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <id>commons-io</id>
+      <version>0.1</version>
+    </dependency>
+    <dependency>
+      <id>xerces</id>
+      <version>2.3.0</version>
+    </dependency>
+    <dependency>
+      <id>xml-apis</id>
+      <version>2.0.2</version>
+    </dependency>
+    <dependency>
+      <id>tyrex</id>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <id>jta</id>
+      <jar>jta1.0.1.jar</jar>
+    </dependency>
+    
+    <dependency>
+      <id>commons-pool</id>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <id>commons-dbcp</id>
+      <version>1.2.1</version>
+    </dependency>
+     
+    <!-- This is only a test dependency -->
+    <dependency>
+      <id>hsqldb</id>
+      <version>1.7.1</version>
+    </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>
+      </resources>
+    </unitTest>
+    
+    
+    <resources>
+      <resource>
+        <directory>${basedir}/src/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    -->
+    
+  </build>
 
-    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/cm/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/project.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/project.xml Wed Jul 13 14:08:55 2005
@@ -1,123 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!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.
-    
+
+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-cm</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Component Manager</name>
-    <package>org.apache.jetspeed</package>
+<extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-cm</id>
+  <name>Jetspeed-2 Component Manager</name>  
+  <package>org.apache.jetspeed</package>
     <description>Component Manager</description>
-    <shortDescription>Common Manager</shortDescription>
+  <shortDescription>Common Manager</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/cm</connection>
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/cm</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/cm
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/cm/</url>
-    </repository>
-
-    <dependencies>
-        &spring-deps;
-        &db-ojb-deps;
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-
-        &pluto-deps;
-
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/TestInterceptorAdapter.java</exclude>
-            </excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/cm/</url>
+  </repository>
 
-    </build>
-
-    <reports>
+  <dependencies>
+  	<dependency>
+      <id>jetspeed2:jetspeed-api</id>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>    
+  </dependencies>
+  
+  <build>
+    <unitTest>
+       <includes>
+        <include>**/Test*.java</include>
+      </includes>
+      <excludes>
+           <exclude>**/TestInterceptorAdapter.java</exclude>
+      </excludes>
+      <resources>
+        <resource>
+          <directory>${basedir}/src/test</directory>
+          <excludes>
+           <exclude>**/*.java</exclude>
+          </excludes>
+      </resource>
+        
+    
+      </resources>
+    </unitTest>  
 
-        &j2-reports;
+    
+  </build>
 
-    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/deploy-tool/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/project.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/project.xml Wed Jul 13 14:08:55 2005
@@ -1,62 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!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.
-    
+
+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-deploy-tools</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Deploy Tools</name>
-    <package>org.apache.jetspeed.tools</package>
+<extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-deploy-tools</id>
+  <name>Jetspeed-2 Deploy Tools</name>  
+  <package>org.apache.jetspeed.tools</package>
     <description>Jetspeed Deploy Tools</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.0</version>
-        </dependency>
+    <dependencies>       
         <dependency>
-            <groupId>saxpath</groupId>
-            <artifactId>saxpath</artifactId>
-            <version>1.0-FCS</version>
-        </dependency>
-        <dependency>
-            <id>jaxen</id>
-            <version>1.0-FCS-full</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
+          <id>jetspeed2:jetspeed-api</id>
+          <version>${jetspeed.version}</version>
+        </dependency>	
     </dependencies>
-
-    <build>
-        <nagEmailAddress>dev@geronimo.apache.org</nagEmailAddress>
-        <sourceDirectory>${basedir}/src/java</sourceDirectory>
-    </build>
 </project>

Modified: portals/jetspeed-2/trunk/components/file-cache/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/file-cache/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/project.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/project.xml Wed Jul 13 14:08:55 2005
@@ -1,112 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!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>
-    <artifactId>jetspeed-file-cache</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 File Cache</name>
-
-    <package>org.apache.jetspeed</package>
-    <description>Jetspeed File Cache</description>
-    <shortDescription>File Cache</shortDescription>
-
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/file-cache</connection>
-        <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/file-cache
-        </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/file-cache/</url>
-    </repository>
-
-    <dependencies>
-        &spring-deps;
-        <dependency>
-            <id>jetspeed2:jetspeed-commons</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <excludes></excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
+Copyright 2004 The Apache Software Foundation
 
-    </build>
+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
 
-    <reports>
+    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.
 
-        &j2-reports;
+  $Id$
+-->
+<project>
+<extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-file-cache</id>
+  <name>Jetspeed-2 File Cache</name>
+  
+  <package>org.apache.jetspeed</package>
+  <description>
+	  Jetspeed File Cache
+  </description>
+  <shortDescription>File Cache</shortDescription>
+
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/file-cache</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/file-cache</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/file-cache/</url>
+  </repository>
+
+  <dependencies>
+    <dependency>
+      <id>jetspeed2:jetspeed-commons</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-api</id>
+      <version>${jetspeed.version}</version>
+    </dependency>  
+  </dependencies>
 
-    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/id-generator/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/id-generator/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/project.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/project.xml Wed Jul 13 14:08:55 2005
@@ -1,107 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!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.
-    
+
+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-id-generator</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 ID Generator</name>
-
-    <package>org.apache.jetspeed</package>
+<extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-id-generator</id>
+  <name>Jetspeed-2 ID Generator</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>Jetspeed ID Generator</description>
-    <shortDescription>ID Generator</shortDescription>
+  <shortDescription>ID Generator</shortDescription>
 
-    <repository>
+  <repository>                 
         <connection>
             scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/id-generator
         </connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/id-generator
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/id-generator/</url>
-    </repository>
-
-    <dependencies>
-        &spring-deps;
-        <dependency>
-            <id>jetspeed2:jetspeed-commons</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-        </dependency>
-        y>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <excludes></excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-    </build>
-
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/id-generator/</url>
+  </repository>
 
-    </reports>
+  <dependencies>
+  	<dependency>
+      <id>jetspeed2:jetspeed-commons</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-api</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: portals/jetspeed-2/trunk/components/jetspeed/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/jetspeed/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/project.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/project.xml Wed Jul 13 14:08:55 2005
@@ -1,148 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!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.
-    
+
+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-components</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Components</name>
-
-    <package>org.apache.jetspeed</package>
+<extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-components</id>
+  <name>Jetspeed-2 Components</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>Jetspeed Components</description>
-    <shortDescription>Jetspeed Components</shortDescription>
+  <shortDescription>Jetspeed Components</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/jetspeed</connection>
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/jetspeed</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/jetspeed
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/jetspeed/</url>
-    </repository>
-
-    <dependencies>
-        &spring-deps;
-        &commons-config-dep;
-        <dependency>
-            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-            <id>portlet-api</id>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <id>commons-httpclient</id>
-            <version>2.0</version>
-        </dependency>
-
-        <dependency>
-            <id>jetspeed-cm</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>castor</id>
-            <version>0.9.4.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <excludes></excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-            </resources>
-        </unitTest>
-
-    </build>
-
-    <reports>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/jetspeed/</url>
+  </repository>
 
-        &j2-reports;
+  <dependencies>	
+    <dependency>
+      <id>jetspeed-cm</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+  </dependencies>
 
-    </reports>
 </project>

Modified: portals/jetspeed-2/trunk/components/locator/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/locator/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/project.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/project.xml Wed Jul 13 14:08:55 2005
@@ -1,103 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!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.
-    
+
+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-locator</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Template Locator</name>
-    <package>org.apache.jetspeed</package>
+<extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-locator</id>
+  <name>Jetspeed-2 Template Locator</name>
+  <package>org.apache.jetspeed</package>
     <description>Jetspeed Locator provides a transparent mechanism to locate resources on the file system.</description>
-    <shortDescription>Helps locate resources on the file system.</shortDescription>
+  <shortDescription>Helps locate resources on the file system.</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/locator</connection>
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/locator</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/locator
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/locator/</url>
-    </repository>
-
-    <dependencies>
-        &spring-deps;
-        <dependency>
-            <id>jetspeed2:jetspeed-commons</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <excludes></excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-    </build>
-
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/locator/</url>
+  </repository>
 
-    </reports>
+  <dependencies>
+    <dependency>
+      <id>jetspeed2:jetspeed-commons</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-api</id>
+      <version>${jetspeed.version}</version>
+    </dependency>    
+  </dependencies>  
 </project>

Modified: portals/jetspeed-2/trunk/components/page-manager/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/project.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/project.xml Wed Jul 13 14:08:55 2005
@@ -1,251 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!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.
-    
+
+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-page-manager</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Page Manager</name>
-
-    <package>org.apache.jetspeed</package>
+  <extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-page-manager</id>
+  <name>Jetspeed-2 Page Manager</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>Page management implementations.</description>
 
-    <repository>
+  <repository>                 
         <connection>
             scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/page-manager
         </connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/page-manager
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/page-manager/</url>
-    </repository>
-
-    <shortDescription>Page Manager</shortDescription>
-    <dependencies>
-
-        &spring-deps;
-
-        &db-ojb-deps;
-
-        &commons-config-dep;
-
-        <dependency>
-            <id>jetspeed2:jetspeed-commons</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-persistence</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-registry</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-file-cache</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-id-generator</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-security</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <!-- Testing only -->
-        <dependency>
-            <id>jetspeed2:jetspeed-rdbms</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>commons-beanutils</id>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <id>commons-configuration</id>
-            <version>1.0-dev</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.6</version>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <id>tyrex</id>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <id>jta</id>
-            <jar>jta1.0.1.jar</jar>
-        </dependency>
-
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
-            <id>castor</id>
-            <version>0.9.4.3</version>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <id>saxpath</id>
-            <version>1.0-FCS</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jaxen</id>
-            <version>1.0-FCS-full</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jdom</id>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <!-- This is only a test dependency -->
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-        </dependency>
-
-        &pluto-deps;
-
-        <dependency>
-            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-            <id>portlet-api</id>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-
-
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/java</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                        <exclude>**/META-INF/**</exclude>
-                    </excludes>
-                </resource>
-
-                &db-ojb-resources;
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/page-manager/</url>
+  </repository>
 
-    </reports>
+  <shortDescription>Page Manager</shortDescription>
+  <dependencies>  	
+   	<dependency>
+      <id>jetspeed2:jetspeed-commons</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-api</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-persistence</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-registry</id>
+      <version>${jetspeed.version}</version>
+    </dependency>      
+    <dependency>
+      <id>jetspeed2:jetspeed-file-cache</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-id-generator</id>
+      <version>${jetspeed.version}</version>
+    </dependency>       
+    <dependency>
+      <id>jetspeed2:jetspeed-security</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-locator</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-profiler</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+    <!-- Testing only -->
+    <dependency>
+      <id>jetspeed2:jetspeed-rdbms</id>
+      <version>${jetspeed.version}</version>
+    </dependency>  
+  </dependencies>  
 </project>

Propchange: portals/jetspeed-2/trunk/components/portal/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 13 14:08:55 2005
@@ -0,0 +1,2 @@
+
+target

Modified: portals/jetspeed-2/trunk/components/portal-site/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/project.xml Wed Jul 13 14:08:55 2005
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
 <!--
     Copyright 2005 The Apache Software Foundation
     
@@ -20,7 +17,7 @@
     $Id:$
 -->
 <project>
-    <extend>${basedir}/../../project.xml</extend>
+    <extend>${basedir}/../../full-portal.xml</extend>
     <pomVersion>3</pomVersion>
     <artifactId>jetspeed-portal-site</artifactId>
     <groupId>jetspeed2</groupId>
@@ -40,236 +37,5 @@
     </repository>
 
     <shortDescription>Portal Site</shortDescription>
-    <dependencies>
-
-        &spring-deps;
-
-        &commons-config-dep;
-
-        <dependency>
-            <id>jetspeed2:jetspeed-commons</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-
-        <!-- Testing only -->
-
-        &db-ojb-deps;
-
-        <dependency>
-            <id>jetspeed-cm</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-page-manager</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-locator</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-persistence</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-registry</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-file-cache</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-id-generator</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-security</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-rdbms</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>commons-beanutils</id>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <id>commons-configuration</id>
-            <version>1.0-dev</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.6</version>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <id>tyrex</id>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <id>jta</id>
-            <jar>jta1.0.1.jar</jar>
-        </dependency>
-
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
-            <id>castor</id>
-            <version>0.9.4.3</version>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <id>saxpath</id>
-            <version>1.0-FCS</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jaxen</id>
-            <version>1.0-FCS-full</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jdom</id>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <!-- This is only a test dependency -->
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-        </dependency>
-
-        &pluto-deps;
-
-        <dependency>
-            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-            <id>portlet-api</id>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-
-
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/java</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                        <exclude>**/META-INF/**</exclude>
-                    </excludes>
-                </resource>
-
-                &db-ojb-resources;
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
-
-    </reports>
+  
 </project>

Modified: portals/jetspeed-2/trunk/components/portal/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/project.xml Wed Jul 13 14:08:55 2005
@@ -1,401 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
+
 <!--
-    Copyright 2004 The Apache Software Foundation
-    
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    
-    $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+	
+	$Id: project.xml 189937 2005-06-10 10:51:53Z ate $
 -->
 <project>
-    <extend>${basedir}/../../project.xml</extend>
-    <pomVersion>3</pomVersion>
-    <artifactId>jetspeed-portal</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Portal Components</name>
-    <package>org.apache.jetspeed</package>
-    <description>Portal Components</description>
-    <shortDescription>Portal Components</shortDescription>
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence</connection>
-        <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/persistence
-        </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/persistence/</url>
-    </repository>
-
-    <dependencies>
-
-        &spring-deps;
-
-        &db-ojb-deps;
-
-        &jmock-deps;
-
-        &commons-config-dep;
-
-        <dependency>
-            <id>jetspeed-cm</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>content-server</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-components</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-deploy-tools</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-rdbms</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-persistence</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-prefs</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-search</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-security</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-registry</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-id-generator</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-file-cache</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-locator</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-capability</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-profiler</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-page-manager</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-portal-site</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-portlet-factory</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-
-        &pluto-deps;
-
-        <dependency>
-            <id>castor</id>
-            <version>0.9.4.3</version>
-        </dependency>
-        <dependency>
-            <id>commons-beanutils</id>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <id>commons-digester</id>
-            <version>1.5</version>
-        </dependency>
-        <dependency>
-            <id>commons-configuration</id>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-fileupload</id>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-httpclient</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-        </dependency>
-
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
-            <id>jdbc-se</id>
-            <jar>jdbc-se2.0.jar</jar>
-        </dependency>
-        <dependency>
-            <id>jetspeed-commons</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>lucene</id>
-            <version>1.4.1</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>jta</id>
-            <jar>jta1.0.1.jar</jar>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-        </dependency>
-        <dependency>
-            <id>portlet-api</id>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-        </dependency>
-        <dependency>
-            <id>tyrex</id>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <id>xalan</id>
-            <version>2.4.1</version>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <id>saxpath</id>
-            <version>1.0-FCS</version>
-        </dependency>
-        <dependency>
-            <id>jaxen</id>
-            <version>1.0-FCS-full</version>
-        </dependency>
-        <dependency>
-            <id>jdom</id>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <id>regexp</id>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <id>jstl</id>
-            <version>1.0.6</version>
-        </dependency>
-        <dependency>
-            <id>taglibs:standard</id>
-            <version>1.0.6</version>
-        </dependency>
-        <dependency>
-            <id>taglibs:request</id>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <id>velocity</id>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <id>velocity-tools</id>
-            <version>1.1</version>
-            <url>http://jakarta.apache.org/velocity</url>
-        </dependency>
-        <dependency>
-            <id>mockrunner</id>
-            <version>0.2.7</version>
-        </dependency>
-        <dependency>
-            <id>commons-codec</id>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <id>jetspeed-sso</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-
-        <dependency>
-            <id>portals-bridges:portals-bridges-common</id>
-            <version>
-                &portals-bridges-common-version;
-            </version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>portals-bridges-velocity</id>
-            <groupId>portals-bridges</groupId>
-            <version>
-                &portals-bridges-velocity-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <sourceModifications>
-
-            <sourceModification>
-                <className>foo.bar</className>
-                <excludes>
-                    <exclude>**/otm/*.java</exclude>
-                </excludes>
-            </sourceModification>
-        </sourceModifications>
-
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-
-                &db-ojb-resources;
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
+	<extend>${basedir}/../../full-portal.xml</extend>
+	<id>jetspeed-portal</id>
+	<name>Jetspeed-2 Portal Components</name>
+	<package>org.apache.jetspeed</package>
+	<description>Portal Components</description>
+	<shortDescription>Portal Components</shortDescription>
+	<repository>
+		<connection>
+			scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal
+		</connection>
+		<developerConnection>
+			scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal
+		</developerConnection>
+		<url>
+			http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portal/
+		</url>
+	</repository>
 
-    </reports>
+	
 </project>

Added: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java?rev=216242&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java (added)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java Wed Jul 13 14:08:55 2005
@@ -0,0 +1,11 @@
+package org.apache.jetspeed.services.title;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.pluto.om.window.PortletWindow;
+
+
+public interface DynamicTitleService extends org.apache.pluto.services.title.DynamicTitleService
+{
+    String getDynamicTitle(PortletWindow window, HttpServletRequest request);
+}

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java Wed Jul 13 14:08:55 2005
@@ -1,5 +1,4 @@
-/*
- * Copyright 2000-2001,2004 The Apache Software Foundation.
+/* Copyright 2000-2001,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.
@@ -22,12 +21,9 @@
 
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.common.ObjectID;
 import org.apache.pluto.om.common.Preference;
 import org.apache.pluto.om.entity.PortletEntity;
 import org.apache.pluto.om.window.PortletWindow;
-import org.apache.pluto.services.title.DynamicTitleService;
-
 
 public class DynamicTitleServiceImpl implements DynamicTitleService
 {
@@ -35,10 +31,32 @@
     public void setDynamicTitle(PortletWindow window,
             HttpServletRequest request, String titleArg)
     {
-        ObjectID id = window.getPortletEntity().getId();        
+        String title = getTitleFromPreference(window, request);
+
+        if (title == null || title.length() < 0)
+        {
+            if (titleArg == null || titleArg.length() == 0)
+            {
+                title = getTitleFromPortletDefinition(window, request);
+            }
+            else
+            {
+                title = titleArg;
+            }
+
+        }
+
         request.setAttribute(
                 PortalReservedParameters.OVERRIDE_PORTLET_TITLE_ATTR
-                        + "::entity.id::" + id.toString(), titleArg);
+                        + "::window.id::" + window.getId(), title);
+
+    }
+    
+    public String getDynamicTitle(PortletWindow window,
+            HttpServletRequest request)
+    {
+        return (String)request.getAttribute(PortalReservedParameters.OVERRIDE_PORTLET_TITLE_ATTR
+                        + "::window.id::" + window.getId());
     }
 
     protected final String getTitleFromPortletDefinition(PortletWindow window,

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java Wed Jul 13 14:08:55 2005
@@ -1,5 +1,4 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
+/* Copyright 2000-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.
@@ -21,6 +20,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.services.title.DynamicTitleService;
 
 public class JetspeedPowerToolFactory
 {
@@ -29,15 +29,18 @@
     private Class jptClass;
     private Constructor constructor;
     private String jptClassName;
+
+    private DynamicTitleService titleService;
     
-    public JetspeedPowerToolFactory(String jptClassName)
+    public JetspeedPowerToolFactory(String jptClassName, DynamicTitleService titleService)
     throws ClassNotFoundException, NoSuchMethodException
     {
         this.jptClassName = jptClassName;
         jptClass = Thread.currentThread().getContextClassLoader().loadClass(jptClassName);
         constructor =
             jptClass.getConstructor(
-                new Class[] {RequestContext.class});        
+                new Class[] {RequestContext.class, DynamicTitleService.class});        
+        this.titleService = titleService;
     }
     
     public JetspeedPowerTool getJetspeedPowerTool(RequestContext requestContext)
@@ -45,7 +48,7 @@
     {
         try
         {
-            Object[] initArgs = { requestContext };
+            Object[] initArgs = { requestContext, this.titleService };
             return (JetspeedPowerTool)constructor.newInstance(initArgs);
         }
         catch (Exception e)
@@ -55,3 +58,4 @@
         }
     }
 }
+



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