dlestrat 2004/11/29 13:10:57
Modified: applications/security project.xml
applications/pam project.xml
Added: applications/security locator.ent
Log:
http://nagoya.apache.org/jira/browse/JS2-23#action_55991
Revision Changes Path
1.12 +28 -17 jakarta-jetspeed-2/applications/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 25 Nov 2004 02:25:58 -0000 1.11
+++ project.xml 29 Nov 2004 21:10:57 -0000 1.12
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
<!--
- $Id$
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
-->
<project>
<extend>${basedir}/./../project.xml</extend>
@@ -147,7 +163,12 @@
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency>
+
+ &myfaces-deps;
+
+ &myfaces-bridge-deps;
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -182,7 +203,7 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
- <!-- needed for hack around PLUTO-83 bug in ChangePasswordPortlet
+ <!-- needed for hack around PLUTO-83 bug in ChangePasswordPortlet
TODO: should be removed again when rc2 is release -->
<dependency>
<id>pluto</id>
@@ -191,7 +212,7 @@
<properties>
<war.bundle>false</war.bundle>
</properties>
- </dependency>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
@@ -206,18 +227,8 @@
</build>
<reports>
- <report>maven-jdepend-plugin</report>
- <report>maven-checkstyle-plugin</report>
- <report>maven-pmd-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-jcoverage-plugin</report>
- <report>maven-linkcheck-plugin</report>
- <report>maven-tasklist-plugin</report>
+
+ &j2-reports;
+
</reports>
</project>
1.1 jakarta-jetspeed-2/applications/security/locator.ent
Index: locator.ent
===================================================================
<!-- Project dependencies -->
<!ENTITY myfaces-deps SYSTEM
"file:../../etc/project-dependencies/myfaces-deps.xml">
<!ENTITY myfaces-bridge-deps SYSTEM
"file:../../etc/project-dependencies/myfaces-bridge-deps.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
1.24 +0 -9 jakarta-jetspeed-2/applications/pam/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- project.xml 26 Nov 2004 18:32:55 -0000 1.23
+++ project.xml 29 Nov 2004 21:10:57 -0000 1.24
@@ -155,15 +155,6 @@
</properties>
</dependency>
<dependency>
- <groupId>jspapi</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0-20040521</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.5</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
