Author: deepal
Date: Tue Feb 5 03:27:41 2008
New Revision: 13264
Log:
fixing the IDE warnings and errors
- It seems like a big commit but I did it carefully
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeManager.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/Axis2RepositoryMediaTypeHandler.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SynapseRepositoryMediaTypeHandler.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/WSDLMediaTypeHandler.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/XSDMediaTypeHandler.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/utils/SchemaFileProcessor.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/utils/WSDLFileProcessor.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/queries/SQLQueryProcessor.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentURLHandler.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingsCollectionURLHandler.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/TagURLHandler.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/utils/Utils.java
branches/registry/1_0/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AbstractRegistryAction.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddResourceAction.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AdvancedSearchAction.java
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/RecentActivityAction.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceHandlerAction.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/AdvancedResourceQuery.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/PermissionUtil.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/TagUtil.java
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeManager.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeManager.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeManager.java
Tue Feb 5 03:27:41 2008
@@ -189,7 +189,7 @@
throws RegistryException {
String parentPath = getParentPath(path);
- String savedPath = null;
+ String savedPath ;
if (parentPath != null) {
Resource parentCollection =
defaultMediaTypeHandler.get(parentPath, null);
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/Axis2RepositoryMediaTypeHandler.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/Axis2RepositoryMediaTypeHandler.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/Axis2RepositoryMediaTypeHandler.java
Tue Feb 5 03:27:41 2008
@@ -79,26 +79,17 @@
}
public boolean delete(String path) throws RegistryException {
- return false; //To change body of implemented methods use File |
Settings | File Templates.
+ return false;
}
public boolean putChild(String childPath, Resource resource) throws
RegistryException {
String childMediaType = resource.getMediaType();
- if
(RegistryConstants.AXIS2_CONF_COLLECTION_MEDIA_TYPE.equals(childMediaType)) {
- return true;
- }
-
- if
(RegistryConstants.AXIS2_SERVICES_COLLECTION_MEDIA_TYPE.equals(childMediaType))
{
- return true;
- }
-
- if
(RegistryConstants.AXIS2_MODULES_COLLECTION_MEDIA_TYPE.equals(childMediaType)) {
- return true;
- }
+ return
RegistryConstants.AXIS2_CONF_COLLECTION_MEDIA_TYPE.equals(childMediaType) ||
+
RegistryConstants.AXIS2_SERVICES_COLLECTION_MEDIA_TYPE.equals(childMediaType) ||
+
RegistryConstants.AXIS2_MODULES_COLLECTION_MEDIA_TYPE.equals(childMediaType);
- return false;
}
public boolean importChild(String childPath, String sourceURL) throws
RegistryException {
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SynapseRepositoryMediaTypeHandler.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SynapseRepositoryMediaTypeHandler.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SynapseRepositoryMediaTypeHandler.java
Tue Feb 5 03:27:41 2008
@@ -108,31 +108,13 @@
String childMediaType = resource.getMediaType();
- if
(RegistryConstants.SYNAPSE_CONF_COLLECTION_MEDIA_TYPE.equals(childMediaType)) {
- return true;
- }
+ return
RegistryConstants.SYNAPSE_CONF_COLLECTION_MEDIA_TYPE.equals(childMediaType) ||
+
RegistryConstants.SYNAPSE_SEQUENCE_COLLECTION_MEDIA_TYPE.equals(childMediaType)
||
+
RegistryConstants.SYNAPSE_ENDPOINT_COLLECTION_MEDIA_TYPE.equals(childMediaType)
||
+
RegistryConstants.SYNAPSE_PROXY_SERVICES_COLLECTION_MEDIA_TYPE.equals(childMediaType)
+ ||
RegistryConstants.SYNAPSE_TASKS_COLLECTION_MEDIA_TYPE.equals(childMediaType) ||
+
RegistryConstants.SYNAPSE_ENTRIES_COLLECTION_MEDIA_TYPE.equals(childMediaType);
- if
(RegistryConstants.SYNAPSE_SEQUENCE_COLLECTION_MEDIA_TYPE.equals(childMediaType))
{
- return true;
- }
-
- if
(RegistryConstants.SYNAPSE_ENDPOINT_COLLECTION_MEDIA_TYPE.equals(childMediaType))
{
- return true;
- }
-
- if
(RegistryConstants.SYNAPSE_PROXY_SERVICES_COLLECTION_MEDIA_TYPE.equals(childMediaType))
{
- return true;
- }
-
- if
(RegistryConstants.SYNAPSE_TASKS_COLLECTION_MEDIA_TYPE.equals(childMediaType)) {
- return true;
- }
-
- if
(RegistryConstants.SYNAPSE_ENTRIES_COLLECTION_MEDIA_TYPE.equals(childMediaType))
{
- return true;
- }
-
- return false;
}
public boolean importChild(String childPath, String sourceURL) throws
RegistryException {
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/WSDLMediaTypeHandler.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/WSDLMediaTypeHandler.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/WSDLMediaTypeHandler.java
Tue Feb 5 03:27:41 2008
@@ -88,7 +88,6 @@
return RegistryConstants.ROOT_PATH;
}
- String parentPath = childPath.substring(0, parentPathLength);
- return parentPath;
+ return childPath.substring(0, parentPathLength);
}
}
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/XSDMediaTypeHandler.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/XSDMediaTypeHandler.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/XSDMediaTypeHandler.java
Tue Feb 5 03:27:41 2008
@@ -91,7 +91,6 @@
return RegistryConstants.ROOT_PATH;
}
- String parentPath = childPath.substring(0, parentPathLength);
- return parentPath;
+ return childPath.substring(0, parentPathLength);
}
}
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/utils/SchemaFileProcessor.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/utils/SchemaFileProcessor.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/utils/SchemaFileProcessor.java
Tue Feb 5 03:27:41 2008
@@ -116,9 +116,9 @@
// set this as an visited schema to stop recursion
visitedShemas.add(xmlSchema.getSourceURI());
if (includes != null) {
- Object externalComponet = null;
- XmlSchemaExternal xmlSchemaExternal = null;
- XmlSchema innerSchema = null;
+ Object externalComponet ;
+ XmlSchemaExternal xmlSchemaExternal ;
+ XmlSchema innerSchema ;
for (Iterator iter = includes.getIterator(); iter.hasNext();) {
externalComponet = iter.next();
if (externalComponet instanceof XmlSchemaExternal) {
@@ -177,9 +177,9 @@
// set this as an visited schema to stop recursion
visitedShemas.add(xmlSchema.getSourceURI());
if (includes != null) {
- Object externalComponet = null;
- XmlSchemaExternal xmlSchemaExternal = null;
- XmlSchema innerSchema = null;
+ Object externalComponet ;
+ XmlSchemaExternal xmlSchemaExternal ;
+ XmlSchema innerSchema ;
for (Iterator iter = includes.getIterator(); iter.hasNext();) {
externalComponet = iter.next();
if (externalComponet instanceof XmlSchemaExternal) {
@@ -195,7 +195,7 @@
// have to do before change the schema location
if (isWsdlInlineSchema) {
changeSchemaNames.put(xmlSchemaExternal.getSchemaLocation(),
-
(String)processedSchemaMap.get(
+ processedSchemaMap.get(
innerSchema.getSourceURI()));
}
// set the new location
@@ -236,12 +236,4 @@
}
}
- private Map getDefaultOptionMap() {
- Map options = new HashMap();
- options.put(OutputKeys.OMIT_XML_DECLARATION, "no");
- options.put(OutputKeys.INDENT, "yes");
-
- return options;
- }
-
}
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/utils/WSDLFileProcessor.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/utils/WSDLFileProcessor.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/utils/WSDLFileProcessor.java
Tue Feb 5 03:27:41 2008
@@ -63,8 +63,8 @@
boolean processImports,
Resource metadata)
throws RegistryException {
- WSDLReader wsdlReader = null;
- String fileNameToSave = null;
+ WSDLReader wsdlReader ;
+ String fileNameToSave ;
try {
wsdlReader = WSDLFactory.newInstance().newWSDLReader();
@@ -74,7 +74,7 @@
}
wsdlReader.setFeature("javax.wsdl.importDocuments", true);
- Definition wsdlDefinition = null;
+ Definition wsdlDefinition ;
try {
wsdlDefinition = wsdlReader.readWSDL(location);
@@ -116,8 +116,8 @@
if (processImports) {
Iterator iter = wsdlDefinition.getImports().values().iterator();
- Vector values = null;
- Import wsdlImport = null;
+ Vector values ;
+ Import wsdlImport ;
// add this to visited list to stop recursion
visitedWSDLs.add(wsdlDefinition.getDocumentBaseURI());
for (; iter.hasNext();) {
@@ -140,12 +140,12 @@
Types types = wsdlDefinition.getTypes();
if (types != null) {
List extensibleElements = types.getExtensibilityElements();
- Schema schemaExtension = null;
- Object extensionObject = null;
- XmlSchema xmlSchema = null;
- XmlSchemaCollection xmlSchemaCollection = null;
- SchemaFileProcessor schemaFileProcessor = null;
- Map changedLocationMap = null;
+ Schema schemaExtension ;
+ Object extensionObject ;
+ XmlSchema xmlSchema ;
+ XmlSchemaCollection xmlSchemaCollection ;
+ SchemaFileProcessor schemaFileProcessor ;
+ Map changedLocationMap ;
String basuri = wsdlDefinition.getDocumentBaseURI();
basuri = basuri.substring(0, basuri.lastIndexOf("/") + 1);
for (Iterator extensibleElementsIter =
extensibleElements.iterator();
@@ -196,8 +196,8 @@
// first we have to process the imports and change the
// schema locations suite for the registry
Iterator iter = wsdlDefinition.getImports().values().iterator();
- Vector values = null;
- Import wsdlImport = null;
+ Vector values ;
+ Import wsdlImport ;
// add this to visited list to stop recursion
visitedWSDLs.add(wsdlDefinition.getDocumentBaseURI());
for (; iter.hasNext();) {
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/queries/SQLQueryProcessor.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/queries/SQLQueryProcessor.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/queries/SQLQueryProcessor.java
Tue Feb 5 03:27:41 2008
@@ -122,7 +122,7 @@
try {
conn.close();
} catch (SQLException ignore) {
-
+ log.info("exception.closing.db");
}
}
}
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentURLHandler.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentURLHandler.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentURLHandler.java
Tue Feb 5 03:27:41 2008
@@ -100,7 +100,9 @@
if (conn != null) {
try {
conn.close();
- } catch (SQLException ignore) {}
+ } catch (SQLException ignore) {
+ log.info("exception.closing.db");
+ }
}
}
@@ -175,6 +177,7 @@
try {
conn1.close();
} catch (SQLException e) {
+ log.info("exception.closing.db");
}
}
}
@@ -194,7 +197,7 @@
}
} catch (UserManagerException e) {
- e.printStackTrace();
+ //
}
@@ -216,7 +219,9 @@
if (conn2 != null) {
try {
conn2.close();
- } catch (SQLException ignore) {}
+ } catch (SQLException ignore) {
+ log.info("exception.closing.db");
+ }
}
}
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingsCollectionURLHandler.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingsCollectionURLHandler.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingsCollectionURLHandler.java
Tue Feb 5 03:27:41 2008
@@ -95,7 +95,7 @@
try {
conn.close();
} catch (SQLException ignore) {
-
+ log.info("exception.closing.db");
}
}
}
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/TagURLHandler.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/TagURLHandler.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/TagURLHandler.java
Tue Feb 5 03:27:41 2008
@@ -22,6 +22,8 @@
import org.wso2.registry.jdbc.dao.TagsDAO;
import org.wso2.registry.jdbc.dataobjects.TaggingDO;
import org.wso2.usermanager.Realm;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -29,6 +31,8 @@
public class TagURLHandler extends URLHandler {
+ private static final Log log = LogFactory.getLog(TagURLHandler.class);
+
public TagURLHandler(DataSource dataSource, Realm realm) {
super(dataSource, realm);
}
@@ -90,7 +94,7 @@
try {
conn.close();
} catch (SQLException ignore) {
-
+ log.info("exception.closing.db");
}
}
}
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
Tue Feb 5 03:27:41 2008
@@ -51,7 +51,6 @@
String parentPath = "";
String resourceName = "";
- String mediaType;
while (iter.hasNext()) {
FileItem item = (FileItem)iter.next();
@@ -67,17 +66,6 @@
resource.setMediaType(item.getString());
}
} else {
- String fileName = item.getName();
- String fileNameOnly;
- if (fileName.indexOf("\\") < 0) {
- fileNameOnly =
-
fileName.substring(fileName.lastIndexOf("/") + 1, fileName
- .length());
- } else {
- fileNameOnly =
-
fileName.substring(fileName.lastIndexOf("\\") + 1, fileName
- .length());
- }
InputStream in = item.getInputStream();
ByteArrayOutputStream out = new
ByteArrayOutputStream();
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java
Tue Feb 5 03:27:41 2008
@@ -108,41 +108,38 @@
HttpServletResponse response,
String path) {
- Resource resource = null;
+ Resource resource ;
try {
resource = ResourceRequestProcessor.getResource(request, path);
- } catch (RegistryException e) {
- setErrorMessage(request, e.getMessage());
- e.printStackTrace();
- }
-
- try {
- Object content = resource.getContent();
- if (content != null) {
-
- response.setDateHeader("Last-Modified",
resource.getLastModified().getTime());
+ try {
+ Object content = resource.getContent();
+ if (content != null) {
+
+ response.setDateHeader("Last-Modified",
resource.getLastModified().getTime());
+
+ if (resource.getMediaType() != null &&
resource.getMediaType().length() > 0) {
+ response.setContentType(resource.getMediaType());
+ } else {
+ response.setContentType("application/download");
+ }
+
+ if (content instanceof byte[]) {
+ ServletOutputStream servletOutputStream =
response.getOutputStream();
+ servletOutputStream.write((byte[])content);
+ response.flushBuffer();
+ servletOutputStream.flush();
+ } else {
+ PrintWriter writer = response.getWriter();
+ writer.write(content.toString());
+ writer.flush();
- if (resource.getMediaType() != null &&
resource.getMediaType().length() > 0) {
- response.setContentType(resource.getMediaType());
- } else {
- response.setContentType("application/download");
+ }
}
- if (content instanceof byte[]) {
- ServletOutputStream servletOutputStream =
response.getOutputStream();
- servletOutputStream.write((byte[])content);
- response.flushBuffer();
- servletOutputStream.flush();
- } else {
- PrintWriter writer = response.getWriter();
- writer.write(content.toString());
- writer.flush();
-
- }
+ } catch (IOException e) {
}
-
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (RegistryException e) {
+ setErrorMessage(request, e.getMessage());
}
}
Modified:
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/utils/Utils.java
==============================================================================
---
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/utils/Utils.java
(original)
+++
branches/registry/1_0/modules/core/src/main/java/org/wso2/registry/servlet/utils/Utils.java
Tue Feb 5 03:27:41 2008
@@ -89,16 +89,7 @@
SecureRegistry userRegistry =
(SecureRegistry)request.getSession().getAttribute(RegistryConstants.USER_REGISTRY);
- if (userRegistry == null) {
- return false;
-
- } else {
- if
(userRegistry.getUserID().equals(RegistryConstants.ANONYMOUS_USER)) {
- return false;
- } else {
- return true;
- }
- }
+ return userRegistry != null &&
!userRegistry.getUserID().equals(RegistryConstants.ANONYMOUS_USER);
}
public static void logInUser(HttpServletRequest request, String userName,
String password)
Modified:
branches/registry/1_0/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
==============================================================================
---
branches/registry/1_0/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
(original)
+++
branches/registry/1_0/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
Tue Feb 5 03:27:41 2008
@@ -198,21 +198,18 @@
String updaterName = "xSamitha";
String tags = "";
String commentWords = "";
- String content;
- String resultType;
-
// create the sql
boolean queryStarted = false;
String pathQuery = "";
- if (resourcePath != null && resourcePath.length() != 0) {
+ if (resourcePath.length() != 0) {
pathQuery = " WHERE R.PATH='" + resourcePath + "'";
queryStarted = true;
}
String authorQuery = "";
- if (authorName != null && authorName.length() != 0) {
+ if (authorName.length() != 0) {
if (queryStarted) {
authorQuery = " AND R.AUTHOR='" + authorName + "'";
} else {
@@ -224,7 +221,7 @@
//String sql = "SELECT A.AID FROM ARTIFACTS A, VERSIONS V, TAGS T,
COMMENTS C WHERE A.AID=V.AID AND V.VN IN (SELECT MAX(V2.VN) FROM VERSIONS V2
WHERE A.AID=V2.AID) AND A.AID=T.AID AND A.AID=C.AID AND A.PATH='c1200/r4'";
String fromVersions = "";
String versionQuery = "";
- if (updaterName != null && updaterName.length() != 0) {
+ if (updaterName.length() != 0) {
fromVersions = ", VERSIONS V";
if (queryStarted) {
versionQuery =
@@ -239,7 +236,7 @@
String fromComments = "";
String commentsQuery = "";
- if (commentWords != null && commentWords.length() != 0) {
+ if (commentWords.length() != 0) {
fromComments = ", COMMENTS C";
if (queryStarted) {
commentsQuery =
@@ -253,7 +250,8 @@
String fromTags = "";
String tagsQuery = "";
- if (tags != null && tags.length() != 0) {
+ if (tags == null || tags.length() == 0) {
+ } else {
String[] tag = tags.split(" ");
if (tag.length > 0) {
fromTags = ", TAGS T";
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
Tue Feb 5 03:27:41 2008
@@ -68,7 +68,7 @@
try {
boolean isAdmin = UserUtil.isAdmin(request,
userRegistry.getUserID());
- request.getSession().setAttribute(UIConstants.IS_ADMIN_ATTR,
new Boolean(isAdmin));
+ request.getSession().setAttribute(UIConstants.IS_ADMIN_ATTR,
Boolean.valueOf(isAdmin));
} catch (RegistryException e) {
request.getSession().setAttribute(UIConstants.ERROR_MESSAGE,
e.getMessage());
request.getRequestDispatcher(UIConstants.ERROR_JSP).forward(request, response);
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AbstractRegistryAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AbstractRegistryAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AbstractRegistryAction.java
Tue Feb 5 03:27:41 2008
@@ -65,8 +65,7 @@
public String getServerBaseURL() {
String reqURL = request.getRequestURL().toString();
- String serverBaseURL = reqURL.substring(0,
reqURL.indexOf("/wso2registry"));
- return serverBaseURL;
+ return reqURL.substring(0, reqURL.indexOf("/wso2registry"));
}
public boolean isLoggedIn() throws RegistryException {
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddResourceAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddResourceAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AddResourceAction.java
Tue Feb 5 03:27:41 2008
@@ -35,7 +35,7 @@
Registry registry = getRegistry();
- String path = "";
+ String path ;
if (parentPath.equals(RegistryConstants.ROOT_PATH)) {
path = RegistryConstants.ROOT_PATH + resourceName;
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AdvancedSearchAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AdvancedSearchAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/AdvancedSearchAction.java
Tue Feb 5 03:27:41 2008
@@ -23,6 +23,8 @@
import org.wso2.registry.secure.AuthorizationFailedException;
import org.wso2.registry.web.actions.utils.AdvancedResourceQuery;
import org.wso2.registry.web.actions.utils.ResourceData;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
@@ -31,6 +33,8 @@
public class AdvancedSearchAction extends AbstractRegistryAction {
+ private Log log = LogFactory.getLog(AdvancedSearchAction.class);
+
private String resourcePath;
private String authorName;
private String updaterName;
@@ -95,8 +99,8 @@
resourceDataList.add(resourceData);
} catch (AuthorizationFailedException e) {
+ log.info("AuthorizationFailedException inside execute
method of AdvancedSearchAction");
// do not show unauthorized resource in search results.
- continue;
}
}
}
@@ -213,40 +217,11 @@
DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT);
try {
- Date date = formatter.parse(dateString);
- return date;
+ return formatter.parse(dateString);
} catch (ParseException e) {
String msg = "Date format is invalid: " + dateString;
throw new RegistryException(msg, e);
}
-
- //if (dateString.indexOf(":") > 0) {
- // String[] dateTime = dateString.split(":");
- // if (dateTime.length == 2) {
- // String[] dateParts = dateTime[0].split("/");
- // String[] timeParts = dateTime[1].split("/");
- // Calendar calendar = new GregorianCalendar(
- // Integer.parseInt(dateParts[0]),
- // Integer.parseInt(dateParts[1]) - 1, // month value
is zero based
- // Integer.parseInt(dateParts[2]),
- // Integer.parseInt(timeParts[0]),
- // Integer.parseInt(timeParts[1]),
- // Integer.parseInt(timeParts[2]));
- //
- // return calendar.getTime();
- // }
- //} else {
- //
- // String[] dateParts = dateString.split("/");
- // Calendar calendar = new GregorianCalendar(
- // Integer.parseInt(dateParts[0]),
- // Integer.parseInt(dateParts[1]),
- // Integer.parseInt(dateParts[2]));
- //
- // return calendar.getTime();
- //}
- //
- //return null;
}
private void calculateAverageStars(ResourceData resourceData) {
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
Tue Feb 5 03:27:41 2008
@@ -25,6 +25,8 @@
import org.wso2.registry.web.MediaTypesReader;
import org.wso2.registry.web.actions.utils.ResourceData;
import org.wso2.registry.web.actions.utils.ResourcePath;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@@ -32,6 +34,8 @@
public class CollectionViewAction extends AbstractRegistryAction {
+ private Log log = LogFactory.getLog(CollectionViewAction.class);
+
private String path;
private List resourceDataList = new ArrayList();
private String parentPath;
@@ -115,7 +119,7 @@
}
}
- Resource resource = null;
+ Resource resource ;
try {
resource = registry.get(path);
} catch (AuthorizationFailedException e) {
@@ -158,9 +162,7 @@
resourceDataList.add(resourceData);
} catch (AuthorizationFailedException e) {
-
- // don't display unauthorized entries.
- continue;
+ log.info("AuthorizationFailedException inside the execute
method of CollectionViewAction");
}
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
Tue Feb 5 03:27:41 2008
@@ -179,43 +179,10 @@
DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT);
try {
- Date date = formatter.parse(dateString);
- return date;
+ return formatter.parse(dateString);
} catch (ParseException e) {
String msg = "Date format is invalid: " + dateString;
throw new RegistryException(msg, e);
}
-
- //if (dateString == null || dateString.length() == 0) {
- // return null;
- //}
- //
- //if (dateString.indexOf(":") > 0) {
- // String[] dateTime = dateString.split(":");
- // if (dateTime.length == 2) {
- // String[] dateParts = dateTime[0].split("/");
- // String[] timeParts = dateTime[1].split("/");
- // Calendar calendar = new GregorianCalendar(
- // Integer.parseInt(dateParts[0]),
- // Integer.parseInt(dateParts[1]) - 1, // month value
is zero based
- // Integer.parseInt(dateParts[2]),
- // Integer.parseInt(timeParts[0]),
- // Integer.parseInt(timeParts[1]),
- // Integer.parseInt(timeParts[2]));
- //
- // return calendar.getTime();
- // }
- //} else {
- //
- // String[] dateParts = dateString.split("/");
- // Calendar calendar = new GregorianCalendar(
- // Integer.parseInt(dateParts[0]),
- // Integer.parseInt(dateParts[1]),
- // Integer.parseInt(dateParts[2]));
- //
- // return calendar.getTime();
- //}
- //
- //return null;
}
}
\ No newline at end of file
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceHandlerAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceHandlerAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceHandlerAction.java
Tue Feb 5 03:27:41 2008
@@ -29,11 +29,7 @@
public Resource getResource(HttpServletRequest request, String path)
throws RegistryException {
-
setRequest(request);
-
- Resource resource = getRegistry().get(path);
-
- return resource;
+ return getRegistry().get(path);
}
}
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
Tue Feb 5 03:27:41 2008
@@ -86,7 +86,6 @@
} catch (AuthorizationFailedException e) {
// do not show unauthorized resources in search results
- continue;
}
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/AdvancedResourceQuery.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/AdvancedResourceQuery.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/AdvancedResourceQuery.java
Tue Feb 5 03:27:41 2008
@@ -442,9 +442,9 @@
tagsQuery = tagsQuery + ")";
}
}
-
- String sql = "SELECT R.PATH FROM ARTIFACTS R" + fromVersions +
fromComments + fromTags + activeResourcesQuery + pathQuery + authorQuery +
updaterNameQuery + createdAfterQuery + createdBeforeQuery + updatedAfterQuery +
updatedBeforeQuery + commentsQuery + tagsQuery;
-
- return sql;
+ return "SELECT R.PATH FROM ARTIFACTS R" + fromVersions + fromComments +
+ fromTags + activeResourcesQuery + pathQuery + authorQuery +
+ updaterNameQuery + createdAfterQuery + createdBeforeQuery +
+ updatedAfterQuery + updatedBeforeQuery + commentsQuery +
tagsQuery;
}
}
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/PermissionUtil.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/PermissionUtil.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/PermissionUtil.java
Tue Feb 5 03:27:41 2008
@@ -42,12 +42,11 @@
String actionToAuthorize = request.getParameter("actionToAuthorize");
String permissionType = request.getParameter("permissionType");
- Realm userRealm = null;
- AccessControlAdmin accessControlAdmin = null;
+ Realm userRealm ;
try {
SecureRegistry secureRegistry =
CommonUtil.getUserRegistry(request);
userRealm = secureRegistry.getUserRealm();
- accessControlAdmin = userRealm.getAccessControlAdmin();
+ userRealm.getAccessControlAdmin();
} catch (Exception e) {
String msg =
@@ -108,7 +107,7 @@
String permissionString = request.getParameter("permissionInput");
String resourcePath = request.getParameter("resourcePath");
- AccessControlAdmin accessControlAdmin = null;
+ AccessControlAdmin accessControlAdmin ;
try {
SecureRegistry secureRegistry =
CommonUtil.getUserRegistry(request);
Realm realm = secureRegistry.getUserRealm();
@@ -213,12 +212,11 @@
String actionToAuthorize = request.getParameter("actionToAuthorize");
String permissionType = request.getParameter("permissionType");
- Realm userRealm = null;
- AccessControlAdmin accessControlAdmin = null;
+ Realm userRealm ;
try {
SecureRegistry secureRegistry =
CommonUtil.getUserRegistry(request);
userRealm = secureRegistry.getUserRealm();
- accessControlAdmin = userRealm.getAccessControlAdmin();
+ userRealm.getAccessControlAdmin();
} catch (Exception e) {
String msg =
"Couldn't get access control admin for changing
authorizations. Caused by: " +
@@ -278,7 +276,7 @@
String permissionString = request.getParameter("permissionInput");
String resourcePath = request.getParameter("resourcePath");
- AccessControlAdmin accessControlAdmin = null;
+ AccessControlAdmin accessControlAdmin ;
try {
SecureRegistry secureRegistry =
CommonUtil.getUserRegistry(request);
Realm realm = secureRegistry.getUserRealm();
@@ -353,7 +351,7 @@
}
} catch (UserManagerException e) {
String msg = "Couldn't set authorizations. Caused by: " +
e.getMessage();
- setErrorMessage(request, e.getMessage());
+ setErrorMessage(request, msg);
}
sendPermissionHTML(request, response, resourcePath);
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
Tue Feb 5 03:27:41 2008
@@ -17,7 +17,6 @@
package org.wso2.registry.web.utils;
import org.wso2.registry.secure.SecureRegistry;
-import org.wso2.registry.secure.AuthorizationFailedException;
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
import org.wso2.registry.RegistryConstants;
@@ -67,7 +66,7 @@
versionPath.setActiveResourcePath(path);
if (versions[i].indexOf("?v=") > 0) {
- long versionNumber = new
Long(versions[i].split("\\?v=")[1]).longValue();
+ long versionNumber =
Long.parseLong(versions[i].split("\\?v=")[1]);
versionPath.setVersionNumber(versionNumber);
}
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/TagUtil.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/TagUtil.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/TagUtil.java
Tue Feb 5 03:27:41 2008
@@ -22,7 +22,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
import java.io.PrintWriter;
import java.io.IOException;
@@ -66,7 +65,7 @@
SecureRegistry secureRegistry = CommonUtil.getUserRegistry(request);
response.setContentType("text/html");
- PrintWriter out = null;
+ PrintWriter out ;
try {
out = response.getWriter();
} catch (IOException e) {
@@ -92,7 +91,7 @@
public static void sendPlainTagError(HttpServletResponse response, String
message) throws RegistryException {
response.setContentType("text/html");
- PrintWriter out = null;
+ PrintWriter out ;
try {
out = response.getWriter();
} catch (IOException e) {
Modified:
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
==============================================================================
---
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
(original)
+++
branches/registry/1_0/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
Tue Feb 5 03:27:41 2008
@@ -95,7 +95,7 @@
SecureRegistry secureRegistry = CommonUtil.getUserRegistry(request);
Realm userRealm = secureRegistry.getUserRealm();
- String[] roles = new String[0];
+ String[] roles ;
try {
roles = userRealm.getUserStoreReader().getUserRoles(userName);
} catch (UserManagerException e) {
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
