Author: channa
Date: Tue May 6 01:06:43 2008
New Revision: 16564
Log:
Adding missing jars for identity 1.5 and correcting an InfoCard error. Also
making admin able to delete tags, pending implementation of the confirmation
message.
Modified:
trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml
trunk/mashup/java/modules/www/ajax_tag.jsp
trunk/mashup/java/modules/www/infocard.jsp
trunk/mashup/java/modules/www/mashup.jsp
trunk/mashup/java/pom.xml
Modified:
trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml
==============================================================================
---
trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml
(original)
+++
trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml
Tue May 6 01:06:43 2008
@@ -76,6 +76,9 @@
<include>org.openxri:openxri-client:jar</include>
<include>org.htmlparser:htmlparser:jar</include>
<include>opensaml:openws:jar</include>
+ <include>opensaml:opensaml:jar</include>
+ <include>opensaml:xmltooling:jar</include>
+ <include>velocity:velocity:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: trunk/mashup/java/modules/www/ajax_tag.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_tag.jsp (original)
+++ trunk/mashup/java/modules/www/ajax_tag.jsp Tue May 6 01:06:43 2008
@@ -81,7 +81,7 @@
for (int i = 0; i < tags.length; i++) {
Tag tag = tags[i];
String name = tag.getTagName();
- boolean canDelete = (author.equals(currentUser));
+ boolean canDelete = (author.equals(currentUser) ||
RegistryUtils.isAdminRole(userRegistry));
if (!canDelete) {
QueryResults isTagger = RegistryUtils.doQuery(userRegistry,
Modified: trunk/mashup/java/modules/www/infocard.jsp
==============================================================================
--- trunk/mashup/java/modules/www/infocard.jsp (original)
+++ trunk/mashup/java/modules/www/infocard.jsp Tue May 6 01:06:43 2008
@@ -30,7 +30,8 @@
</head>
<body>
<form name="frm" id="frm" method="post" action="<%=
"true".equals(fromSelfReg) ? "register_self_identity.jsp" :
"identityaccept.jsp"%>">
- <input type="hidden" name="FromIdentityProvider"
value="true" /><br/>
+ <input type="hidden" name="InfoCardSignin" value="Log in" /><br/>
+ <input type="hidden" name="FromIdentityProvider" value="true"
/><br/>
<input type="hidden" name="<%=
MashupConstants.AUTHENTICATION_METHOD %>" value="infocard" /><br/>
<input type="hidden" name="bounceback" value="<%=bounceback%>"/>
<OBJECT type="application/x-informationCard" name="xmlToken">
Modified: trunk/mashup/java/modules/www/mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp (original)
+++ trunk/mashup/java/modules/www/mashup.jsp Tue May 6 01:06:43 2008
@@ -483,7 +483,7 @@
for (int i = 0; i < tags.length; i++) {
Tag tag = tags[i];
String name = tag.getTagName();
- boolean canDelete = (author.equals(currentUser));
+ boolean canDelete = (author.equals(currentUser) ||
RegistryUtils.isAdminRole(userRegistry));
if (!canDelete) {
QueryResults isTagger =
RegistryUtils.doQuery(userRegistry,
Modified: trunk/mashup/java/pom.xml
==============================================================================
--- trunk/mashup/java/pom.xml (original)
+++ trunk/mashup/java/pom.xml Tue May 6 01:06:43 2008
@@ -1225,6 +1225,46 @@
<artifactId>openws</artifactId>
<version>${openws.version}</version>
</dependency>
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>${xmltooling.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>werken-xpath</groupId>
+ <artifactId>werken-xpath</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>${velocity.version}</version>
+ </dependency>
</dependencies>
<modules>
@@ -1330,5 +1370,7 @@
<openid.version>0.9.3.1</openid.version>
<openws.version>1.0</openws.version>
<dataService.version>0.1alpha</dataService.version>
+ <velocity.version>1.5</velocity.version>
+ <xmltooling.version>1.0</xmltooling.version>
</properties>
</project>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
