Author: chathura
Date: Fri Jan 25 00:09:35 2008
New Revision: 12871
Log:
Implemented the backend support for live announcements.
Improved the resource upload and import by reading the streams into byte arrays.
Added:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/beans/AnnouncementsBean.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AnnouncementsUtil.java
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
Fri Jan 25 00:09:35 2008
@@ -263,7 +263,7 @@
if (currentCollection.getState() ==
RegistryConstants.DELETED_STATE) {
- resourceDAO.markActivated(currentCollection.getId(),
conn);
+ resourceDAO.markActivated(currentCollection.getId(), conn);
} else if (!currentCollection.isDirectory()) {
@@ -292,10 +292,11 @@
URLConnection uc = url.openConnection();
InputStream in = uc.getInputStream();
- int data;
ByteArrayOutputStream out = new ByteArrayOutputStream();
- while ((data = in.read()) != -1) {
- out.write(data);
+ byte[] buffer = new byte[1024];
+ int c;
+ while ((c = in.read(buffer)) != -1) {
+ out.write(buffer, 0, c);
}
out.flush();
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
Fri Jan 25 00:09:35 2008
@@ -80,10 +80,11 @@
}
InputStream in = item.getInputStream();
- int read;
ByteArrayOutputStream out = new
ByteArrayOutputStream();
- while ((read = in.read()) != -1) {
- out.write(read);
+ byte[] buffer = new byte[1024];
+ int c;
+ while ((c = in.read(buffer)) != -1) {
+ out.write(buffer, 0, c);
}
out.flush();
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
Fri Jan 25 00:09:35 2008
@@ -27,6 +27,7 @@
import org.wso2.registry.web.actions.*;
import org.wso2.registry.web.beans.AdminBean;
import org.wso2.registry.web.beans.VersionsBean;
+import org.wso2.registry.web.beans.AnnouncementsBean;
import org.wso2.registry.web.utils.*;
import javax.servlet.ServletConfig;
@@ -831,6 +832,8 @@
re.printStackTrace();
}
+ setAnnouncementsBean(request);
+
try {
request.getRequestDispatcher(UIConstants.RESOURCES_JSP)
.forward(request, response);
@@ -853,6 +856,7 @@
}
request.getSession().setAttribute(UIConstants.USER_MANAGEMENT_BEAN,
userManagementAction);
+ setAnnouncementsBean(request);
try {
request.getRequestDispatcher(UIConstants.USER_MANAGEMENT_JSP).forward(request,
response);
@@ -868,6 +872,7 @@
AdminBean adminBean = AdminUtil.getAdminBean(request);
request.getSession().setAttribute(UIConstants.ADMIN_BEAN, adminBean);
+ setAnnouncementsBean(request);
try {
request.getRequestDispatcher(UIConstants.ADMIN_JSP).forward(request, response);
@@ -896,6 +901,7 @@
}
request.getSession().setAttribute(UIConstants.ACTIVITY_BEAN,
recentActivityAction);
+ setAnnouncementsBean(request);
try {
request.getRequestDispatcher(UIConstants.ACTIVITY_JSP).forward(request,
response);
@@ -912,6 +918,7 @@
RecentActivityAction recentActivity = new RecentActivityAction();
recentActivity.setRequest(request);
request.getSession().setAttribute(UIConstants.ACTIVITY_BEAN,
recentActivity);
+ setAnnouncementsBean(request);
try {
request.getRequestDispatcher(UIConstants.ACTIVITY_JSP).forward(request,
response);
@@ -927,6 +934,7 @@
AdvancedSearchAction advancedSearchAction = new AdvancedSearchAction();
advancedSearchAction.setRequest(request);
request.getSession().setAttribute(UIConstants.ADVANCED_SEARCH_BEAN,
advancedSearchAction);
+ setAnnouncementsBean(request);
try {
request.getRequestDispatcher(UIConstants.ADVANCED_SEARCH_JSP).forward(request,
response);
@@ -958,6 +966,7 @@
}
request.getSession().setAttribute(UIConstants.ADVANCED_SEARCH_BEAN,
advancedSearchAction);
+ setAnnouncementsBean(request);
try {
request.getRequestDispatcher(UIConstants.ADVANCED_SEARCH_JSP).forward(request,
response);
@@ -981,6 +990,7 @@
}
request.getSession().setAttribute(UIConstants.SEARCH_BEAN,
searchAction);
+ setAnnouncementsBean(request);
try {
request.getRequestDispatcher(UIConstants.SEARCH_JSP).forward(request, response);
@@ -1003,6 +1013,7 @@
}
request.getSession().setAttribute(UIConstants.USER_BEAN,
userDetailsAction);
+ setAnnouncementsBean(request);
try {
request.getRequestDispatcher(UIConstants.USER_JSP).forward(request, response);
@@ -1013,6 +1024,11 @@
}
}
+ private void setAnnouncementsBean(HttpServletRequest request) {
+ AnnouncementsBean announcementsBean =
AnnouncementsUtil.getAnnouncementsBean();
+ request.getSession().setAttribute(UIConstants.ANNOUNCEMENTS_BEAN,
announcementsBean);
+ }
+
private void setErrorMessage(HttpServletRequest request, String message) {
request.getSession().setAttribute(UIConstants.ERROR_MESSAGE, message);
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
Fri Jan 25 00:09:35 2008
@@ -27,6 +27,7 @@
public static final String SEARCH_BEAN = "search";
public static final String USER_BEAN = "userBean";
public static final String VERSIONS_BEAN = "versions.bean";
+ public static final String ANNOUNCEMENTS_BEAN = "announcements.bean";
public static final String AJAX_RATING_BEAN = "ajaxRating";
public static final String AJAX_DESCRIPTION_STRING = "ajaxDesc";
public static final String AJAX_COMMENTS_LIST = "ajaxComments";
Added:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/beans/AnnouncementsBean.java
==============================================================================
--- (empty file)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/beans/AnnouncementsBean.java
Fri Jan 25 00:09:35 2008
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2006, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * 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 org.wso2.registry.web.beans;
+
+public class AnnouncementsBean {
+
+ private String announcements;
+
+ public String getAnnouncements() {
+ return announcements;
+ }
+
+ public void setAnnouncements(String announcements) {
+ this.announcements = announcements;
+ }
+}
Added:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AnnouncementsUtil.java
==============================================================================
--- (empty file)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AnnouncementsUtil.java
Fri Jan 25 00:09:35 2008
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2006, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * 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 org.wso2.registry.web.utils;
+
+import org.wso2.registry.web.beans.AnnouncementsBean;
+import org.wso2.registry.announcement.Announcement;
+
+public class AnnouncementsUtil {
+
+ public static final String ANNOUNCEMENTS_URL =
"http://wso2.com/announcements/mashup/SNAPSHOT/index.html";;
+
+ public static AnnouncementsBean getAnnouncementsBean() {
+
+ Announcement announcement = new Announcement();
+ String annConent = announcement.get(null, ANNOUNCEMENTS_URL);
+
+ if (annConent == null) {
+ annConent = "";
+ }
+
+ AnnouncementsBean announcementsBean = new AnnouncementsBean();
+ announcementsBean.setAnnouncements(annConent);
+ return announcementsBean;
+ }
+}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp Fri Jan
25 00:09:35 2008
@@ -1,14 +1,27 @@
+<%@ page import="org.wso2.registry.web.beans.AnnouncementsBean" %>
+<%@ page import="org.wso2.registry.web.UIConstants" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<%
+ AnnouncementsBean announcementsBean = (AnnouncementsBean)
request.getSession().getAttribute(UIConstants.ANNOUNCEMENTS_BEAN);
+%>
+
<h2>WSO2 Registry</h2>
<p>
WSO2 Registry enables you to store, catalog, index and manage your enterprise
meta data in a simple, scalable and easy-to-use model.
It is designed around community concepts such as tags, comments, ratings,
users and roles.
Think of the registry as a structured wiki designed to help you manage your
meta-data in a simple business-friendly system.
</p>
-<h3>WSO2 Registry Training</h3>
-<span>
-Register now for the WSO2 Registry online training at
-</span>
-<h3>WSO2 Registry Training</h3>
-<span>
-Register now for the WSO2 Registry online training at
-</span>
\ No newline at end of file
+
+<% if (announcementsBean != null) { %>
+<%=announcementsBean.getAnnouncements()%>
+<% } %>
+
+<!--<h3>WSO2 Registry Training</h3>-->
+<!--<span>-->
+<!--Register now for the WSO2 Registry online training at-->
+<!--</span>-->
+<!--<h3>WSO2 Registry Training</h3>-->
+<!--<span>-->
+<!--Register now for the WSO2 Registry online training at-->
+<!--</span>-->
\ No newline at end of file
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
