[Carbon-dev] svn commit r31282 - trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app

[kalani at wso2.com]

Author: kalani
Date: Sun Feb 22 23:09:24 2009
New Revision: 31282
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=31282

Log:
Fixing an issue in registry exports.


Modified:
   trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/ResourceServlet.java
   trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/Utils.java

Modified: trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/ResourceServlet.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/ResourceServlet.java?rev=31282&r1=31281&r2=31282&view=diff
==============================================================================
--- trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/ResourceServlet.java	(original)
+++ trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/ResourceServlet.java	Sun Feb 22 23:09:24 2009
@@ -62,7 +62,10 @@
                 response.setContentType("application/download");
             }
 
-            InputStream contentStream = resource.getContentStream();
+            InputStream contentStream = null;
+            if (resource.getContent() != null) {
+                contentStream = resource.getContentStream();
+            }
             if (contentStream != null) {
 
                 try {

Modified: trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/Utils.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/Utils.java?rev=31282&r1=31281&r2=31282&view=diff
==============================================================================
--- trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/Utils.java	(original)
+++ trunk/carbon/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/app/Utils.java	Sun Feb 22 23:09:24 2009
@@ -8,6 +8,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.axiom.om.util.Base64;
 import org.osgi.util.tracker.ServiceTracker;
 
 import javax.servlet.http.HttpServletRequest;
@@ -40,7 +41,7 @@
 
             String msg = "User's Registry instance is not found. " +
                     "Creating a anonymous Registry instance for the user.";
-            if(log.isDebugEnabled()) {
+            if (log.isDebugEnabled()) {
                 log.debug(msg);
             }
 
@@ -56,12 +57,33 @@
 
         UserRegistry registry =
                 (UserRegistry) request.getSession().getAttribute(RegistryConstants.USER_REGISTRY);
+        if (registry == null) {
 
+            if (!request.getHeader("Authorization").equals(null)) {
+                String auth = request.getHeader("Authorization");
+                if (auth != null && auth.length() > 0) {
+                    String[] aParts = auth.trim().split(" ");
+                    if (aParts.length == 2) {
+                        String credentials = aParts[1];
+                        String decodedCredentials = new String(Base64.decode(credentials));
+                        String[] cParts = decodedCredentials.trim().split(":");
+                        if (cParts.length == 2) {
+                            String userName = cParts[0];
+                            String password = cParts[1];
+
+                            EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) registryTracker.getService();
+                            registry = embeddedRegistry.getUserRegistry(userName, password);
+                            request.getSession().setAttribute(RegistryConstants.USER_REGISTRY, registry);
+                        }
+                    }
+                }
+            }
+        }
         if (registry == null) {
 
             String msg = "User's Registry instance is not found. " +
                     "Creating a anonymous Registry instance for the user.";
-            if(log.isDebugEnabled()) {
+            if (log.isDebugEnabled()) {
                 log.debug(msg);
             }