Author: weaver
Date: Wed Jul 13 14:22:02 2005
New Revision: 216267
URL: http://svn.apache.org/viewcvs?rev=216267&view=rev
Log:
SRP-304:
http://issues.apache.org/jira/browse/JS2-304#action_12315720
Removed:
portals/jetspeed-2/trunk/portal-webapp/locator.ent
portals/jetspeed-2/trunk/portal-webapp/locator.path
Modified:
portals/jetspeed-2/trunk/portal-webapp/maven.xml
portals/jetspeed-2/trunk/portal-webapp/project.xml
Modified: portals/jetspeed-2/trunk/portal-webapp/maven.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/maven.xml?rev=216267&r1=216266&r2=216267&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/maven.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/maven.xml Wed Jul 13 14:22:02 2005
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
<!--
Copyright 2004 The Apache Software Foundation
Modified: portals/jetspeed-2/trunk/portal-webapp/project.xml
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/project.xml?rev=216267&r1=216266&r2=216267&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/project.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/project.xml Wed Jul 13 14:22:02 2005
@@ -1,92 +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
-
- 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</artifactId>
- <name>Jetspeed-2 Portal Engine</name>
- <description>Portlet content is aggregated into one page by this
engine.</description>
- <shortDescription>Portal Aggregation Engine</shortDescription>
-
- <repository>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portal</connection>
- <developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portal
- </developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portal/</url>
- </repository>
-
- &portal-webapp-deps;
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <excludes>
- <exclude>org/apache/jetspeed/test/JetspeedTest</exclude>
- <exclude>org/apache/jetspeed/test/JetspeedTestSuite</exclude>
- <exclude>**/TestJMX*.java</exclude>
- <exclude>**/TestEngine.java</exclude>
- </excludes>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>repository_database.xml</exclude>
- </excludes>
- </resource>
- <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>
-
- &db-ojb-resources;
+Copyright 2004 The Apache Software Foundation
- </resources>
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
- </build>
- <reports>
+ http://www.apache.org/licenses/LICENSE-2.0
- &j2-reports;
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
- </reports>
+ $Id$
+-->
+<project>
+ <extend>${basedir}/../full-portal.xml</extend>
+ <pomVersion>3</pomVersion>
+ <id>jetspeed</id>
+ <name>Jetspeed-2 Portal Engine</name>
+ <description>
+ Portlet content is aggregated into one page by this engine.
+ </description>
+ <shortDescription>Portal Aggregation Engine</shortDescription>
+
+ <repository>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portal</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/portal</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/portal/</url>
+ </repository>
+
+ <dependencies>
+ <dependency>
+ <id>jetspeed2:jetspeed-portal</id>
+ <version>${jetspeed.version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ </dependencies>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
