dlestrat 2004/11/16 17:06:43
Modified: applications/jsf-demo/src/webapp greeting.jsp tree.jsp
applications/jsf-demo/src/webapp/WEB-INF web.xml
faces-config.xml
applications/pam/src/webapp/WEB-INF/view profiler-admin.jsp
prototype.jsp user-admin.jsp profiler-criterion.jsp
applications/pam/src/webapp/WEB-INF web.xml
applications/jsf-demo project.xml
applications/pam project.xml
Added: applications/jsf-demo/src/webapp treeTable.jsp
applications/jsf-demo/src/java/guessNumber TreeItem.java
TreeTable.java
applications/jsf-demo locator.ent
applications/pam locator.ent
applications/jsf-demo/src/webapp/images sw_med_rond.gif
Removed: applications/jsf-demo/src/webapp/css tree.css
Log:
http://nagoya.apache.org/jira/browse/JS2-159
Revision Changes Path
1.6 +5 -1
jakarta-jetspeed-2/applications/jsf-demo/src/webapp/greeting.jsp
Index: greeting.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jsf-demo/src/webapp/greeting.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- greeting.jsp 14 Oct 2004 00:18:05 -0000 1.5
+++ greeting.jsp 17 Nov 2004 01:06:42 -0000 1.6
@@ -35,6 +35,10 @@
<h2>Wanna see a tree?</h2>
<br>
<h:commandLink id="treeLink" action="treeView">
- <h:outputText value="Click Here"/>
+ <h:outputText value="Click Here for Tree"/>
+ </h:commandLink>
+ |
+ <h:commandLink id="treeTableLink" action="treeTableView">
+ <h:outputText value="Click Here for Tree Table"/>
</h:commandLink>
</f:view>
1.6 +4 -4
jakarta-jetspeed-2/applications/jsf-demo/src/webapp/tree.jsp
Index: tree.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jsf-demo/src/webapp/tree.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tree.jsp 14 Oct 2004 00:18:05 -0000 1.5
+++ tree.jsp 17 Nov 2004 01:06:43 -0000 1.6
@@ -1,9 +1,9 @@
-<%@ page import="net.sourceforge.myfaces.custom.tree.DefaultMutableTreeNode,
-
net.sourceforge.myfaces.custom.tree.model.DefaultTreeModel"%>
+<%@ page import="org.apache.myfaces.custom.tree.DefaultMutableTreeNode,
+ org.apache.myfaces.custom.tree.model.DefaultTreeModel"%>
<%@ page session="true" contentType="text/html;charset=utf-8"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://myfaces.sourceforge.net/tld/myfaces_ext_0_9.tld";
prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/extensions"; prefix="x"%>
<!--
/*
@@ -63,7 +63,7 @@
<f:verbatim><br></f:verbatim>
</h:form>
- <h:commandLink id="goHome" action="guessGameStart">
+ <h:commandLink id="goHome" action="guessGameStartFromTree">
<h:outputText value="Return to Guess Game"/>
</h:commandLink>
1.1
jakarta-jetspeed-2/applications/jsf-demo/src/webapp/treeTable.jsp
Index: treeTable.jsp
===================================================================
<%@ page session="true" contentType="text/html;charset=utf-8"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/extensions"; prefix="x"%>
<!--
/*
* 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.
*/
//-->
<link href='css/tree.css' type='text/css'/>
<f:view>
<f:verbatim><h2>Here is a tree table example.</h2></f:verbatim>
<h:form>
<x:tree id="tree" value="#{treeTable.treeModel}"
var="treeItem"
styleClass="tree"
nodeClass="treenode"
headerClass="treeHeader"
footerClass="treeFooter"
rowClasses="treeRow1, treeRow2"
columnClasses="treeCol1, treeCol2"
selectedNodeClass="treenodeSelected"
expandRoot="true">
<h:column>
<f:facet name="header">
<h:outputText value="Header 1" />
</f:facet>
<h:outputText value="#{treeItem.isoCode}" />
</h:column>
<x:treecolumn>
<f:facet name="header">
<h:outputText value="Header 2" />
</f:facet>
<h:outputText value="#{treeItem.name}" />
</x:treecolumn>
<h:column>
<f:facet name="header">
<h:outputText value="Header 3" />
</f:facet>
<h:outputText value="#{treeItem.description}" />
</h:column>
<f:facet name="footer">
<h:outputText value="Footer" />
</f:facet>
</x:tree>
<f:verbatim><br></f:verbatim>
</h:form>
<h:commandLink id="goHome" action="guessGameStartFromTreeTable">
<h:outputText value="Return to Guess Game"/>
</h:commandLink>
</f:view>
1.3 +4 -4
jakarta-jetspeed-2/applications/jsf-demo/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jsf-demo/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 14 Oct 2004 00:18:05 -0000 1.2
+++ web.xml 17 Nov 2004 01:06:43 -0000 1.3
@@ -50,7 +50,7 @@
<param-value>/WEB-INF/faces-config.xml</param-value>
</context-param>
<context-param>
- <param-name>net.sourceforge.myfaces.ALLOW_JAVASCRIPT</param-name>
+ <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
<param-value>true</param-value>
<description>
This parameter tells MyFaces if javascript code should be
allowed in the
@@ -64,7 +64,7 @@
</context-param>
<context-param>
- <param-name>net.sourceforge.myfaces.DETECT_JAVASCRIPT</param-name>
+ <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
<param-value>false</param-value>
<description>
This parameter tells MyFaces if javascript code should be
allowed in the
@@ -84,7 +84,7 @@
</context-param>
<context-param>
- <param-name>net.sourceforge.myfaces.PRETTY_HTML</param-name>
+ <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
<param-value>true</param-value>
<description>
If true, rendered HTML code will be formatted, so that it is
"human readable".
@@ -96,7 +96,7 @@
<!-- Listener, that does all the startup work (configuration, init). -->
<listener>
-
<listener-class>net.sourceforge.myfaces.webapp.StartupServletContextListener</listener-class>
+
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener>
<!-- Faces Servlet -->
1.6 +36 -1
jakarta-jetspeed-2/applications/jsf-demo/src/webapp/WEB-INF/faces-config.xml
Index: faces-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jsf-demo/src/webapp/WEB-INF/faces-config.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- faces-config.xml 14 Oct 2004 00:18:05 -0000 1.5
+++ faces-config.xml 17 Nov 2004 01:06:43 -0000 1.6
@@ -68,11 +68,38 @@
<to-view-id>/tree.jsp</to-view-id>
</navigation-case>
</navigation-rule>
+
+ <navigation-rule>
+ <description>
+ The decision rule used by the NavigationHandler to
+ determine which view must be displayed after the
+ current view, greeting.jsp is processed.
+ </description>
+ <from-view-id>/greeting.jsp</from-view-id>
+ <navigation-case>
+ <description>
+ Indicates to the NavigationHandler that the response.jsp
+ view must be displayed if the Action referenced by a
+ UICommand component on the greeting.jsp view returns
+ the outcome "treeView".
+ </description>
+ <from-outcome>treeTableView</from-outcome>
+ <to-view-id>/treeTable.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
<navigation-rule>
<from-view-id>/tree.jsp</from-view-id>
<navigation-case>
- <from-outcome>guessGameStart</from-outcome>
+ <from-outcome>guessGameStartFromTree</from-outcome>
+ <to-view-id>/greeting.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/treeTable.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>guessGameStartFromTreeTable</from-outcome>
<to-view-id>/greeting.jsp</to-view-id>
</navigation-case>
</navigation-rule>
@@ -115,6 +142,14 @@
</managed-property>
</managed-bean>
+
+ <!-- Managed bean for tree -->
+ <managed-bean>
+ <managed-bean-name>treeTable</managed-bean-name>
+ <managed-bean-class>guessNumber.TreeTable</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
</faces-config>
1.9 +1 -1
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/profiler-admin.jsp
Index: profiler-admin.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/profiler-admin.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- profiler-admin.jsp 10 Nov 2004 13:27:02 -0000 1.8
+++ profiler-admin.jsp 17 Nov 2004 01:06:43 -0000 1.9
@@ -1,7 +1,7 @@
<%@ page session="true" contentType="text/html;charset=utf-8"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://myfaces.sourceforge.net/tld/myfaces_ext_0_9.tld";
prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/extensions"; prefix="x"%>
<!--
/*
1.3 +1 -1
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/prototype.jsp
Index: prototype.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/prototype.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prototype.jsp 10 Nov 2004 13:27:02 -0000 1.2
+++ prototype.jsp 17 Nov 2004 01:06:43 -0000 1.3
@@ -14,7 +14,7 @@
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f" %>
-<%@ taglib uri="http://myfaces.sourceforge.net/tld/myfaces_ext_0_9.tld";
prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/extensions"; prefix="x"%>
<link href='css/security-admin.css' type='text/css'/>
1.7 +1 -1
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-admin.jsp
Index: user-admin.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-admin.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- user-admin.jsp 10 Nov 2004 13:27:02 -0000 1.6
+++ user-admin.jsp 17 Nov 2004 01:06:43 -0000 1.7
@@ -14,7 +14,7 @@
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f" %>
-<%@ taglib uri="http://myfaces.sourceforge.net/tld/myfaces_ext_0_9.tld";
prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/extensions"; prefix="x"%>
<link href='css/security-admin.css' type='text/css'/>
1.3 +1 -1
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/profiler-criterion.jsp
Index: profiler-criterion.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/profiler-criterion.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- profiler-criterion.jsp 10 Nov 2004 13:27:02 -0000 1.2
+++ profiler-criterion.jsp 17 Nov 2004 01:06:43 -0000 1.3
@@ -1,7 +1,7 @@
<%@ page session="true" contentType="text/html;charset=utf-8"%>
<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://myfaces.sourceforge.net/tld/myfaces_ext_0_9.tld";
prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/extensions"; prefix="x"%>
<!--
/*
1.10 +4 -4
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- web.xml 12 Nov 2004 06:34:25 -0000 1.9
+++ web.xml 17 Nov 2004 01:06:43 -0000 1.10
@@ -29,7 +29,7 @@
<param-value>/WEB-INF/faces-config.xml</param-value>
</context-param>
<context-param>
- <param-name>net.sourceforge.myfaces.ALLOW_JAVASCRIPT</param-name>
+ <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
<param-value>true</param-value>
<description>
This parameter tells MyFaces if javascript code should be
allowed in the
@@ -43,7 +43,7 @@
</context-param>
<context-param>
- <param-name>net.sourceforge.myfaces.DETECT_JAVASCRIPT</param-name>
+ <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
<param-value>false</param-value>
<description>
This parameter tells MyFaces if javascript code should be
allowed in the
@@ -63,7 +63,7 @@
</context-param>
<context-param>
- <param-name>net.sourceforge.myfaces.PRETTY_HTML</param-name>
+ <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
<param-value>true</param-value>
<description>
If true, rendered HTML code will be formatted, so that it is
"human readable".
@@ -75,7 +75,7 @@
<!-- Listener, that does all the startup work (configuration, init). -->
<listener>
-
<listener-class>net.sourceforge.myfaces.webapp.StartupServletContextListener</listener-class>
+
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener>
<!-- Faces Servlet -->
1.1
jakarta-jetspeed-2/applications/jsf-demo/src/java/guessNumber/TreeItem.java
Index: TreeItem.java
===================================================================
/*
* 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.
*/
package guessNumber;
import java.io.Serializable;
/**
* <p>
* Bean class holding a tree item.
* </p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">David Le Strat</a>
* */
public class TreeItem implements Serializable
{
private int id;
private String name;
private String isoCode;
private String description;
/**
* @param id The id.
* @param name The name.
* @param isoCode The isoCode.
* @param description The description.
*/
public TreeItem(int id, String name, String isoCode, String description)
{
this.id = id;
this.name = name;
this.isoCode = isoCode;
this.description = description;
}
/**
* @return Returns the description.
*/
public String getDescription()
{
return description;
}
/**
* @param description The description to set.
*/
public void setDescription(String description)
{
this.description = description;
}
/**
* @return Returns the id.
*/
public int getId()
{
return id;
}
/**
* @param id The id to set.
*/
public void setId(int id)
{
this.id = id;
}
/**
* @return Returns the isoCode.
*/
public String getIsoCode()
{
return isoCode;
}
/**
* @param isoCode The isoCode to set.
*/
public void setIsoCode(String isoCode)
{
this.isoCode = isoCode;
}
/**
* @return Returns the name.
*/
public String getName()
{
return name;
}
/**
* @param name The name to set.
*/
public void setName(String name)
{
this.name = name;
}
}
1.1
jakarta-jetspeed-2/applications/jsf-demo/src/java/guessNumber/TreeTable.java
Index: TreeTable.java
===================================================================
/*
* 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.
*/
package guessNumber;
import java.io.Serializable;
import org.apache.myfaces.custom.tree.DefaultMutableTreeNode;
import org.apache.myfaces.custom.tree.model.DefaultTreeModel;
/**
* <p>
* Bean holding the tree hierarchy.
* </p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">David Le Strat</a>
*/
public class TreeTable implements Serializable
{
private DefaultTreeModel treeModel;
/**
* @param treeModel The treeModel.
*/
public TreeTable(DefaultTreeModel treeModel)
{
this.treeModel = treeModel;
}
/**
* <p>
* Default constructor.
* </p>
*/
public TreeTable()
{
DefaultMutableTreeNode root = new DefaultMutableTreeNode(new
TreeItem(1, "XY", "9001", "XY 9001"));
DefaultMutableTreeNode a = new DefaultMutableTreeNode(new TreeItem(2,
"A", "9001", "A 9001"));
root.insert(a);
DefaultMutableTreeNode b = new DefaultMutableTreeNode(new TreeItem(3,
"B", "9001", "B 9001"));
root.insert(b);
DefaultMutableTreeNode c = new DefaultMutableTreeNode(new TreeItem(4,
"C", "9001", "C 9001"));
root.insert(c);
DefaultMutableTreeNode node = new DefaultMutableTreeNode(new
TreeItem(5, "a1", "9002", "a1 9002"));
a.insert(node);
node = new DefaultMutableTreeNode(new TreeItem(6, "a2", "9002", "a2
9002"));
a.insert(node);
node = new DefaultMutableTreeNode(new TreeItem(7, "a3", "9002", "a3
9002"));
a.insert(node);
node = new DefaultMutableTreeNode(new TreeItem(8, "b", "9002", "b
9002"));
b.insert(node);
a = node;
node = new DefaultMutableTreeNode(new TreeItem(9, "x1", "9003", "x1
9003"));
a.insert(node);
node = new DefaultMutableTreeNode(new TreeItem(9, "x2", "9003", "x2
9003"));
a.insert(node);
this.treeModel = new DefaultTreeModel(root);
}
/**
* @return Returns the treeModel.
*/
public DefaultTreeModel getTreeModel()
{
return treeModel;
}
/**
* @param treeModel The treeModel to set.
*/
public void setTreeModel(DefaultTreeModel treeModel)
{
this.treeModel = treeModel;
}
}
1.8 +13 -49 jakarta-jetspeed-2/applications/jsf-demo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/jsf-demo/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 12 Oct 2004 21:30:37 -0000 1.7
+++ project.xml 17 Nov 2004 01:06:43 -0000 1.8
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
<!--
Copyright 2004 The Apache Software Foundation
@@ -85,44 +88,17 @@
</properties>
</dependency>
<dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-jsf-api</artifactId>
- <version>1.0.7-SNAPSHOT</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces</artifactId>
- <version>1.0.7-SNAPSHOT</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-components</artifactId>
- <version>1.0.7-SNAPSHOT</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>portals-bridges</groupId>
- <artifactId>portals-bridges-myfaces</artifactId>
- <version>0.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<id>log4j</id>
<version>1.2.8</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency>
+
+ &myfaces-deps;
+
+ &myfaces-bridge-deps;
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -164,20 +140,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/jsf-demo/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.22 +26 -39 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 12 Nov 2004 06:34:25 -0000 1.21
+++ project.xml 17 Nov 2004 01:06:43 -0000 1.22
@@ -1,5 +1,22 @@
<?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.
+-->
<project>
<extend>${basedir}/./../project.xml</extend>
<pomVersion>3</pomVersion>
@@ -131,33 +148,11 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-jsf-api</artifactId>
- <version>1.0.7-SNAPSHOT</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces</artifactId>
- <version>1.0.7-SNAPSHOT</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-components</artifactId>
- <version>1.0.7-SNAPSHOT</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
+
+ &myfaces-deps;
+
+ &myfaces-bridge-deps;
+
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
@@ -267,7 +262,7 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
- <resources>
+ <resources>
<resource>
<directory>${basedir}/src/java/</directory>
<includes>
@@ -277,17 +272,9 @@
</resources>
</build>
<reports>
- <report>maven-jdepend-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-linkcheck-plugin</report>
- <report>maven-tasklist-plugin</report>
+
+ &j2-reports;
+
</reports>
<properties/>
</project>
1.1 jakarta-jetspeed-2/applications/pam/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.1
jakarta-jetspeed-2/applications/jsf-demo/src/webapp/images/sw_med_rond.gif
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
