ate 2004/07/24 15:06:57
Modified: applications/security/src/webapp/WEB-INF web.xml
applications/security project.xml
applications/security/src/webapp/WEB-INF/security/user-mgt
addUser.jsp
Removed: applications/security/src/webapp/WEB-INF struts-html.tld
struts-bean.tld struts-portlet.tld struts-logic.tld
Log:
Struts-portlet framework updated for struts-1.2.1
Struts-portlet.tld is now included in the struts-portlet.jar: cleaned up (removed)
local struts and struts-portlet tlds
Revision Changes Path
1.5 +0 -16
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 12 Jun 2004 04:15:59 -0000 1.4
+++ web.xml 24 Jul 2004 22:06:57 -0000 1.5
@@ -36,18 +36,6 @@
<welcome-file>security/user-mgt/addUser.jsp</welcome-file>
</welcome-file-list>
<taglib>
- <taglib-uri>struts-bean.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>struts-logic.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>struts-html.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
- </taglib>
- <taglib>
<taglib-uri>c.tld</taglib-uri>
<taglib-location>/WEB-INF/c.tld</taglib-location>
</taglib>
@@ -62,9 +50,5 @@
<taglib>
<taglib-uri>x.tld</taglib-uri>
<taglib-location>/WEB-INF/x.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>struts-portlet.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-portlet.tld</taglib-location>
</taglib>
</web-app>
1.5 +4 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 24 Jul 2004 11:01:23 -0000 1.4
+++ project.xml 24 Jul 2004 22:06:57 -0000 1.5
@@ -117,7 +117,7 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3</version>
<url>http://jakarta.apache.org/commons/validator/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -135,14 +135,14 @@
<dependency>
<groupId>struts</groupId>
<artifactId>struts</artifactId>
- <version>1.2.1-dev-20040407</version>
+ <version>1.2.1</version>
<url>http://jakarta.apache.org/struts/</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>struts-portlet</groupId>
+ <groupId>jetspeed2</groupId>
<artifactId>struts-portlet</artifactId>
<version>0.1</version>
<properties>
1.2 +2 -2
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/user-mgt/addUser.jsp
Index: addUser.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/user-mgt/addUser.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- addUser.jsp 12 Jun 2004 04:16:13 -0000 1.1
+++ addUser.jsp 24 Jul 2004 22:06:57 -0000 1.2
@@ -13,8 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib uri="struts-html.tld" prefix="html" %>
-<%@ taglib uri="struts-portlet.tld" prefix="sp" %>
+<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-portlet"; prefix="sp" %>
<sp:form action="/addUser" focus="username">
<table>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
