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 [2/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
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.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.
@@ -59,6 +58,7 @@
 import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.services.title.DynamicTitleService;
 import org.apache.jetspeed.util.ArgUtil;
 import org.apache.pluto.om.entity.PortletEntity;
 import org.apache.pluto.om.portlet.ContentTypeSet;
@@ -117,11 +117,13 @@
 
     protected RequestContext requestContext;
     protected Context velocityContext;
+    private DynamicTitleService titleService;
     
-    public JetspeedPowerToolImpl( RequestContext requestContext ) throws Exception
+    public JetspeedPowerToolImpl( RequestContext requestContext, DynamicTitleService titleService ) throws Exception
     {
         HttpServletRequest request = requestContext.getRequest();
         this.requestContext = requestContext;
+        this.titleService = titleService;
         windowAccess = (PortletWindowAccessor) getComponent(PortletWindowAccessor.class.getName());
         entityAccess = (PortletEntityAccessComponent) getComponent(PortletEntityAccessComponent.class.getName());
         renderRequest = (RenderRequest) request.getAttribute(RENDER_REQUEST_ATTR);
@@ -295,7 +297,6 @@
      *                  retreive.
      * @return The PortletEntity represented by the current fragment.
      * @throws Exception
-     * @deprecated Please use WindowAccessor to get entities
      */
     public PortletEntity getPortletEntity( ContentFragment f ) throws Exception
     {
@@ -821,14 +822,7 @@
     {
         String title = null;
 
-        String override = (String)getRequestContext().getRequest().getAttribute(
-                PortalReservedParameters.OVERRIDE_PORTLET_TITLE_ATTR
-                        + "::entity.id::" + entity.getId());
-        if (override != null && !override.equals(""))
-        {
-            title = override;
-        }
-        else if (f != null)
+        if (f != null)
         {
             title = f.getTitle();
         }
@@ -852,22 +846,17 @@
      * @return
      */
     public String getTitle( PortletEntity entity )
-    {
-        String title = null;
-        if (entity != null && entity.getPortletDefinition() != null)
-        {
-            title = getRequestContext().getPreferedLanguage(entity.getPortletDefinition()).getTitle();
-        }
-        
-        if (title == null && entity.getPortletDefinition() != null)
+    {       
+        try
         {
-            title = entity.getPortletDefinition().getName();
+            return titleService.getDynamicTitle(windowAccess.getPortletWindow(getCurrentFragment()), getRequestContext().getRequest());
         }
-        else if (title == null)
+        catch (Exception e)
         {
-            title = "Invalid portlet entity "+entity.getId();
+           log.error("Unable to reteive portlet title: "+e.getMessage(), e);
+           return "Title Error: "+e.getMessage();
         }
-        return title;
+      
     }
 
     public Object getComponent( String name )

Modified: portals/jetspeed-2/trunk/components/portlet-factory/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portlet-factory/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/project.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/project.xml Wed Jul 13 14:08:55 2005
@@ -1,128 +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
-    
+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-portlet-factory</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Portlet Factory</name>
-
-    <package>org.apache.jetspeed</package>
+<extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-portlet-factory</id>
+  <name>Jetspeed-2 Portlet Factory</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>Jetspeed Portlet Factory</description>
-    <shortDescription>Portlet Factory</shortDescription>
+  <shortDescription>Portlet Factory</shortDescription>
 
-    <repository>
+  <repository>                 
         <connection>
             scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portlet-factory
         </connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portlet-factory
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portlet-factory/</url>
-    </repository>
-
-    <dependencies>
-
-        &pluto-deps;
-
-        <dependency>
-            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-            <id>portlet-api</id>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-commons</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <excludes></excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-            </resources>
-        </unitTest>
-
-    </build>
-
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portlet-factory/</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/prefs/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/project.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/project.xml Wed Jul 13 14:08:55 2005
@@ -1,260 +1,94 @@
 <?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-prefs</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Preferences SPI Components</name>
+  <extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-prefs</id>
+  <name>Jetspeed-2 Preferences SPI Components</name>
 
     <description>Preferences SPI Components</description>
-    <shortDescription>Preferences SPI Components</shortDescription>
+  <shortDescription>Preferences SPI Components</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/perfs</connection>
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/perfs</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/perfs
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/perfs/</url>
-    </repository>
-
-    <dependencies>
-
-        &spring-deps;
-
-        &db-ojb-deps;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/perfs/</url>
+  </repository>
 
-        &commons-config-dep;
+  <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-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed-persistence</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <!-- Testing only -->
-        <dependency>
-            <id>jetspeed-rdbms</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-beanutils</id>
-            <version>1.6.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jdbc-se</id>
-            <jar>jdbc-se2.0.jar</jar>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jdom</id>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <!-- This is only a test dependency -->
-        <dependency>
-            <id>jetspeed-commons</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>jta</id>
-            <jar>jta1.0.1.jar</jar>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>tyrex</id>
-            <version>1.0.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                        <exclude>repository_database.xml</exclude>
-                    </excludes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/java</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-
-                &db-ojb-resources;
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
+    <dependency>
+      <id>jetspeed-cm</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+     <dependency>
+      <id>jetspeed2:jetspeed-api</id>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>    
+    <dependency>
+      <id>jetspeed-commons</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jetspeed-rdbms</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    
+  </dependencies>
+  <build>
 
-    </reports>
+    <unitTest>
+       <includes>
+        <include>**/Test*.java</include>
+      </includes>
+      <resources>
+        <resource>
+          <directory>${basedir}/src/test</directory>
+          <excludes>
+           <exclude>**/*.java</exclude>
+           <exclude>repository_database.xml</exclude>
+          </excludes>
+        </resource>
+        <resource>
+          <directory>${basedir}/src/java</directory>
+          <excludes>
+           <exclude>**/*.java</exclude>
+          </excludes>
+        </resource>
+      </resources>
+    </unitTest>
+  </build>
 </project>

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

Modified: portals/jetspeed-2/trunk/components/rdbms/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/project.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/project.xml Wed Jul 13 14:08:55 2005
@@ -1,157 +1,47 @@
 <?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-rdbms</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 RDBMS Components</name>
-
-    <package>org.apache.jetspeed</package>
+  <extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-rdbms</id>
+  <name>Jetspeed-2 RDBMS Components</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>RDBMS Components</description>
-    <shortDescription>RDBMS Components</shortDescription>
+  <shortDescription>RDBMS Components</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</connection>
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rdbms/</url>
-    </repository>
-
-    <dependencies>
-        &spring-deps;
-        <dependency>
-            <id>jetspeed-cm</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>tyrex</id>
-            <version>1.0.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jta</id>
-            <jar>jta1.0.1.jar</jar>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rdbms/</url>
+  </repository>
 
-    </reports>
+  <dependencies>    
+  	<dependency>
+      <id>jetspeed-cm</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>  	
+  </dependencies>	
 </project>

Modified: portals/jetspeed-2/trunk/components/registry/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/project.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/project.xml Wed Jul 13 14:08:55 2005
@@ -1,310 +1,85 @@
 <?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-registry</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Registry Components</name>
-
-    <package>org.apache.jetspeed</package>
+  <extend>${basedir}/../../core-build.xml</extend>
+  <id>jetspeed-registry</id>
+  <name>Jetspeed-2 Registry Components</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>Registry Components</description>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/registry</connection>
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/registry</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/registry
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/registry/</url>
-    </repository>
-
-    <shortDescription>Registry Components</shortDescription>
-    <dependencies>
-
-        &spring-deps;
-
-        &db-ojb-deps;
-
-        &jmock-deps;
-
-        &commons-config-dep;
-
-        <dependency>
-            <id>jetspeed-cm</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-api</id>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed-persistence</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed-prefs</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-portlet-factory</id>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <!-- Testing only -->
-        <dependency>
-            <id>jetspeed-rdbms</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-beanutils</id>
-            <version>1.6.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-configuration</id>
-            <version>1.0-dev</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jdbc-se</id>
-            <jar>jdbc-se2.0.jar</jar>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jdom</id>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <!-- This is only a test dependency -->
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed-commons</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-
-        &pluto-deps;
-
-        <dependency>
-            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-            <id>portlet-api</id>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jta</id>
-            <jar>jta1.0.1.jar</jar>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>tyrex</id>
-            <version>1.0.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-
-
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <excludes>
-                <exclude>**/Abstract*</exclude>
-
-            </excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                        <exclude>repository_database.xml</exclude>
-                    </excludes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/java</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-
-                &db-ojb-resources;
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/registry/</url>
+  </repository>
 
-    </reports>
+  <shortDescription>Registry 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-api</id>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>    
+    <dependency>
+      <id>jetspeed-prefs</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jetspeed2:jetspeed-portlet-factory</id>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>        
+    <!-- Testing only -->
+    <dependency>
+      <id>jetspeed-commons</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jetspeed-rdbms</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+  </dependencies>	
 </project>

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

Modified: portals/jetspeed-2/trunk/components/search/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/search/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/search/project.xml (original)
+++ portals/jetspeed-2/trunk/components/search/project.xml Wed Jul 13 14:08:55 2005
@@ -1,164 +1,54 @@
 <?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-search</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Search Component</name>
-
-    <package>org.apache.jetspeed</package>
+  <extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-search</id>
+  <name>Jetspeed-2 Search Component</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>Search component for Jetspeed.</description>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/search</connection>
+  <repository>                 
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/search</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/search
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/search/</url>
-    </repository>
-
-    <shortDescription>Search</shortDescription>
-    <dependencies>
-
-        &commons-config-dep;
-        <dependency>
-            <id>jetspeed-api</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed2:jetspeed-commons</id>
-            <version>
-                &jetspeed-version;
-            </version>
-        </dependency>
-        <dependency>
-            <id>commons-httpclient</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>lucene</id>
-            <version>1.4.1</version>
-        </dependency>
-
-
-        <!-- Testing only -->
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <id>commons-beanutils</id>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <id>log4j</id>
-            <version>1.2.6</version>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-        </dependency>
-
-        &pluto-deps;
-
-        <dependency>
-            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-            <id>portlet-api</id>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <id>servletapi</id>
-            <version>2.3</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-
-
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/java</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                        <exclude>**/META-INF/**</exclude>
-                    </excludes>
-                </resource>
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/search/</url>
+  </repository>
 
-    </reports>
+  <shortDescription>Search</shortDescription>
+  <dependencies>     
+   
+  	<dependency>
+      <id>jetspeed-api</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+   	<dependency>
+      <id>jetspeed2:jetspeed-commons</id>
+      <version>${jetspeed.version}</version>
+    </dependency>
+  
+  </dependencies>
+  
 </project>

Modified: portals/jetspeed-2/trunk/components/security/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/project.xml (original)
+++ portals/jetspeed-2/trunk/components/security/project.xml Wed Jul 13 14:08:55 2005
@@ -1,291 +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-security</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Security Components</name>
-
-    <package>org.apache.jetspeed</package>
+  <extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-security</id>
+  <name>Jetspeed-2 Security Components</name>
+  
+  <package>org.apache.jetspeed</package>
     <description>Security Components</description>
-    <shortDescription>Security Components</shortDescription>
+  <shortDescription>Security Components</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</connection>
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security</connection>
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/security
         </developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/security/</url>
-    </repository>
-
-    <dependencies>
-
-        &spring-deps;
-
-        &db-ojb-deps;
-
-        &commons-config-dep;
-
-        <!-- Components -->
-        <dependency>
-            <id>jetspeed-api</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed-cm</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed-persistence</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jetspeed-prefs</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <!-- Testing only -->
-        <dependency>
-            <id>jetspeed-rdbms</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-lang</id>
-            <version>2.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-logging</id>
-            <version>1.0.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-beanutils</id>
-            <version>1.6.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>junit</id>
-            <version>3.8.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-
-            <id>log4j</id>
-            <version>1.2.8</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-collections</id>
-            <version>3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-io</id>
-            <version>0.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>commons-pool</id>
-            <version>1.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-dbcp</id>
-            <version>1.2.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jdbc-se</id>
-            <jar>jdbc-se2.0.jar</jar>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xerces</id>
-            <version>2.3.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>xml-apis</id>
-            <version>2.0.2</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>jdom</id>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <!-- This is only a test dependency -->
-        <dependency>
-            <id>jetspeed-commons</id>
-            <groupId>jetspeed2</groupId>
-            <version>
-                &jetspeed-version;
-            </version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>hsqldb</id>
-            <version>1.7.1</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
-            <id>portlet-api</id>
-            <version>1.0</version>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <id>jta</id>
-            <jar>jta1.0.1.jar</jar>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>tyrex</id>
-            <version>1.0.1</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <id>commons-codec</id>
-            <version>1.3</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/ldap/*</exclude>
-            </excludes>
-
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/java</directory>
-                    <excludes>
-                        <exclude>**/*.java</exclude>
-                    </excludes>
-                </resource>
-
-                &db-ojb-resources;
-
-                &log4j-resources;
-
-            </resources>
-        </unitTest>
-
-        <resources>
-            <resource>
-                <directory>${basedir}/src/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-    </build>
-    <reports>
-
-        &j2-reports;
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/security/</url>
+  </repository>
 
-    </reports>
+  <dependencies>
+	<!-- Components -->
+	<dependency>
+      <id>jetspeed-api</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+  	<dependency>
+      <id>jetspeed-cm</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jetspeed-prefs</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <!-- Testing only -->
+    <dependency>
+      <id>jetspeed-rdbms</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jetspeed-commons</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>         
+  </dependencies>  
 </project>

Modified: portals/jetspeed-2/trunk/components/sso/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/project.xml?rev=216242&r1=216241&r2=216242&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/project.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/project.xml Wed Jul 13 14:08:55 2005
@@ -1,310 +1,89 @@
 <?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-sso</artifactId>
-    <groupId>jetspeed2</groupId>
-    <name>Jetspeed-2 Single Sign On Components</name>
-
-    <package>org.apache.jetspeed</package>
+  <extend>${basedir}/../../core-build.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>jetspeed-sso</id>
+  <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>
+  <shortDescription>Single Sign On SSO Components</shortDescription>
 
-    <repository>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/sso</connection>
+  <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>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/sso/</url>
+  </repository>
 
-
-        <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>
+  <dependencies>
+  
+  
+       
+    <!-- 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>
+
+    <!-- Testing only -->    
+    <dependency>
+      <id>jetspeed-rdbms</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jetspeed-commons</id>
+      <groupId>jetspeed2</groupId>
+      <version>${jetspeed.version}</version>
+      <properties>
+        <war.bundle>false</war.bundle>
+      </properties>
+    </dependency>
+        
+  </dependencies>
+  
 </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