Author: chathura
Date: Thu Feb 7 08:55:28 2008
New Revision: 13411
Log:
Added more links to the about pane.
Minor bug fixes.
Changed the artifact versions to QA1.
Added:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/images/favicon.ico
(contents, props changed)
- copied, changed from r13401,
branches/registry/1_0/modules/webapps/src/main/webapp/favicon.ico
Removed:
branches/registry/1_0/modules/webapps/src/main/webapp/favicon.ico
Modified:
branches/registry/1_0/modules/core/conf/log4j.properties
branches/registry/1_0/modules/core/pom.xml
branches/registry/1_0/modules/distribution/pom.xml
branches/registry/1_0/modules/documentation/pom.xml
branches/registry/1_0/modules/webapps/pom.xml
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
branches/registry/1_0/modules/webapps/src/main/webapp/admin/header.jsp
branches/registry/1_0/modules/webapps/src/main/webapp/admin/promotion.jsp
branches/registry/1_0/pom.xml
Modified: branches/registry/1_0/modules/core/conf/log4j.properties
==============================================================================
--- branches/registry/1_0/modules/core/conf/log4j.properties (original)
+++ branches/registry/1_0/modules/core/conf/log4j.properties Thu Feb 7
08:55:28 2008
@@ -31,7 +31,7 @@
# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %r %m%n
# LOGFILE is set to be a File appender using a PatternLayout.
log4j.appender.LOGFILE=org.apache.log4j.FileAppender
Modified: branches/registry/1_0/modules/core/pom.xml
==============================================================================
--- branches/registry/1_0/modules/core/pom.xml (original)
+++ branches/registry/1_0/modules/core/pom.xml Thu Feb 7 08:55:28 2008
@@ -4,7 +4,7 @@
<parent>
<groupId>org.wso2.registry</groupId>
<artifactId>org.wso2.registry</artifactId>
- <version>1.0-RC1</version>
+ <version>1.0-QA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/registry/1_0/modules/distribution/pom.xml
==============================================================================
--- branches/registry/1_0/modules/distribution/pom.xml (original)
+++ branches/registry/1_0/modules/distribution/pom.xml Thu Feb 7 08:55:28 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.registry</groupId>
<artifactId>org.wso2.registry</artifactId>
- <version>1.0-RC1</version>
+ <version>1.0-QA1</version>
</parent>
Modified: branches/registry/1_0/modules/documentation/pom.xml
==============================================================================
--- branches/registry/1_0/modules/documentation/pom.xml (original)
+++ branches/registry/1_0/modules/documentation/pom.xml Thu Feb 7 08:55:28 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.registry</groupId>
<artifactId>org.wso2.registry</artifactId>
- <version>1.0-RC1</version>
+ <version>1.0-QA1</version>
</parent>
<artifactId>wso2registry-documentation</artifactId>
Modified: branches/registry/1_0/modules/webapps/pom.xml
==============================================================================
--- branches/registry/1_0/modules/webapps/pom.xml (original)
+++ branches/registry/1_0/modules/webapps/pom.xml Thu Feb 7 08:55:28 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.registry</groupId>
<artifactId>org.wso2.registry</artifactId>
- <version>1.0-RC1</version>
+ <version>1.0-QA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2registry-webapp</artifactId>
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.wso2.registry</groupId>
<artifactId>wso2registry-core</artifactId>
- <version>1.0-RC1</version>
+ <version>1.0-QA1</version>
<exclusions>
<exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion>
<exclusion><groupId>tomcat</groupId><artifactId>naming-factory</artifactId></exclusion>
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
Thu Feb 7 08:55:28 2008
@@ -161,8 +161,9 @@
resourceDataList.add(resourceData);
- } catch (AuthorizationFailedException e) {
- log.info("AuthorizationFailedException inside the execute
method of CollectionViewAction");
+ } catch (AuthorizationFailedException ignore) {
+ // if we get an auth failed exception while accessing a child,
we simply skip it.
+ // we are not showing unauthorized resources.
}
Modified: branches/registry/1_0/modules/webapps/src/main/webapp/admin/header.jsp
==============================================================================
--- branches/registry/1_0/modules/webapps/src/main/webapp/admin/header.jsp
(original)
+++ branches/registry/1_0/modules/webapps/src/main/webapp/admin/header.jsp
Thu Feb 7 08:55:28 2008
@@ -1,8 +1,8 @@
<%@ page import="org.wso2.registry.RegistryConstants" %>
<%@ page import="org.wso2.registry.web.UIConstants" %>
<div class="popup-main" id="popup-main" style="display:none;">
-<link rel="icon" href="favicon.ico" type="image/x-icon" />
-<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+<link rel="icon" href="/wso2registry/admin/images/favicon.ico"
type="image/x-icon" />
+<link rel="shortcut icon" href="/wso2registry/admin/images/favicon.ico"
type="image/x-icon" />
</div>
<div class="popup" id="popup" style="display:none;">
Copied:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/images/favicon.ico
(from r13401, branches/registry/1_0/modules/webapps/src/main/webapp/favicon.ico)
==============================================================================
Binary files. No diff available.
Modified:
branches/registry/1_0/modules/webapps/src/main/webapp/admin/promotion.jsp
==============================================================================
--- branches/registry/1_0/modules/webapps/src/main/webapp/admin/promotion.jsp
(original)
+++ branches/registry/1_0/modules/webapps/src/main/webapp/admin/promotion.jsp
Thu Feb 7 08:55:28 2008
@@ -7,16 +7,20 @@
%>
<h2 class="sub-headding-about">About</h2>
<div class="promotionDivContent">
-<a href="http://wso2.org/wiki/display/registry/WSO2+Registry+User+Guide"
target="_blank" class="area">Registry user guide</a>
-
-<a href="https://wso2.org/jira/browse/REGISTRY " target="_blank"
class="area">Registry JIRA</a>
-
-<span class="area" onclick="showHideCommon('getTrainingDiv');">NEWS</span>
- <div id="getTrainingDiv" class="aboutBack">
- <% if (announcementsBean != null) { %>
- <%=announcementsBean.getAnnouncements()%>
- <% } %>
- </div>
+ <a href="http://wso2.org/wiki/display/registry/WSO2+Registry+User+Guide"
target="_blank" class="area">User guide</a>
+
+ <a href="https://wso2.org/jira/browse/REGISTRY" target="_blank"
class="area">File a bug</a>
+
+ <a href="http://wso2.com/support/" target="_blank" class="area">Get
support</a>
+
+ <a href="http://wso2.com/training/" target="_blank" class="area">Get
training</a>
+
+ <span class="area" onclick="showHideCommon('getTrainingDiv');">NEWS</span>
+ <div id="getTrainingDiv" class="aboutBack">
+ <% if (announcementsBean != null) { %>
+ <%=announcementsBean.getAnnouncements()%>
+ <% } %>
+ </div>
</div>
Modified: branches/registry/1_0/pom.xml
==============================================================================
--- branches/registry/1_0/pom.xml (original)
+++ branches/registry/1_0/pom.xml Thu Feb 7 08:55:28 2008
@@ -24,7 +24,7 @@
<groupId>org.wso2.registry</groupId>
<artifactId>org.wso2.registry</artifactId>
<packaging>pom</packaging>
- <version>1.0-RC1</version>
+ <version>1.0-QA1</version>
<name>WSO2 Repository</name>
<url>http://wso2.org/projects/registry</url>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev