Author: deepal
Date: Sun Dec 16 22:06:05 2007
New Revision: 11197
Log:
fixing APP test case to cope with changes made for resource delete
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAtomProvider.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAtomProvider.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAtomProvider.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAtomProvider.java
Sun Dec 16 22:06:05 2007
@@ -366,12 +366,21 @@
if(executeQuery){
entry.setTitle(value);
} else {
- Resource childNode = registry.get(value);
- entry.setId(baseURI + "atom" + childNode.getPath());
- entry.setTitle(childNode.getPath());
- entry.setSummary(resource.getDescription());
- entry.setUpdated(childNode.getLastModified());
- entry.setPublished(childNode.getCreatedTime());
+ try {
+ Resource childNode = registry.get(value);
+ entry.setId(baseURI + "atom" +
childNode.getPath());
+ entry.setTitle(childNode.getPath());
+ entry.setSummary(resource.getDescription());
+ entry.setUpdated(childNode.getLastModified());
+ entry.setPublished(childNode.getCreatedTime());
+ } catch (RegistryException e) {
+ entry.setId(baseURI + "atom" + resource.getPath());
+ entry.setTitle(value);
+ entry.setSummary(resource.getDescription());
+ entry.setUpdated(resource.getLastModified());
+ entry.setPublished(resource.getCreatedTime());
+ log.info("Child resource does not exist");
+ }
}
entry.addLink(baseURI + "atom" + value);
feed.addEntry(entry);
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
Sun Dec 16 22:06:05 2007
@@ -19,68 +19,79 @@
package org.wso2.registry.app;
import org.apache.abdera.protocol.server.impl.DefaultServiceContext;
+import org.apache.abdera.protocol.server.impl.AbstractSingletonProviderManager;
+import org.apache.abdera.protocol.server.servlet.AbderaServlet;
+import org.apache.abdera.protocol.server.ServiceContext;
import org.mortbay.jetty.Server;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.ServletHolder;
+import org.wso2.registry.jdbc.JDBCRegistryTest;
+import org.wso2.registry.jdbc.JDBCRegistry;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.servlet.RegistryRealmFactory;
+import org.wso2.usermanager.Realm;
+
+import javax.servlet.ServletException;
//This test case run all the test cases that there in JDBCRegistry using
RemoteRegistry
-public class JettyBasedServerTest {
+public class JettyBasedServerTest extends JDBCRegistryTest {
private Server server;
private DefaultServiceContext abderaServiceContext;
- //public void setUp() {
- // try {
- // if (registry == null) {
- // initJetty();
- // registry = new RemoteRegistry();
- // }
- // } catch (Exception e) {
- // fail("Failed to initialize the registry.");
- // }
- //}
-
+ public void setUp() {
+ try {
+ if (registry == null) {
+ initJetty();
+ registry = new RemoteRegistry();
+ }
+ } catch (Exception e) {
+ fail("Failed to initialize the registry.");
+ }
+ }
+//
// protected void tearDown() throws Exception {
// if (server != null) server.stop();
// }
+//
+ private void initJetty() throws Exception {
+ abderaServiceContext = new RegistryAPPServiceContext();
+ RegistryAPPTargetResolver resolver = new RegistryAPPTargetResolver();
+ abderaServiceContext.setTargetResolver(resolver);
+ AbstractSingletonProviderManager pm = new
RegistryAtomProviderManager();
+ abderaServiceContext.setProviderManager(pm);
+
+ server = new Server(8080);
+ Context root = new Context(server, "/wso2registry",
Context.NO_SESSIONS);
+ root.addServlet(new ServletHolder(new AbderaServlet() {
+
+ @Override
+ protected ServiceContext createServiceContext() {
+
abderaServiceContext.setDefaultProviderManager(RegistryAtomProviderManager.class.getName());
+
abderaServiceContext.setDefaultTargetResolver(RegistryAPPTargetResolver.class.getName());
+ abderaServiceContext.init(getAbdera(),
getProperties(getServletConfig()));
+ JDBCRegistry jdbcRegistry = null;
+ try {
+ Realm registryRealm =
+ RegistryRealmFactory.createInMemoryRegistryRealm();
+ jdbcRegistry = new JDBCRegistry();
+ jdbcRegistry.init(registryRealm);
+ System.getProperties().put(RegistryConstants.REGISTRY,
jdbcRegistry);
+ } catch (RegistryException e) {
+ e.printStackTrace();
+ }
+ registry = jdbcRegistry;
+ return abderaServiceContext;
+ }
+
+ public void init() throws ServletException {
+ super.init();
+ System.out.println("done");
+ }
+ }), "/*");
+ server.start();
- //private void initJetty() throws Exception {
- // abderaServiceContext = new RegistryAPPServiceContext();
- // RegistryAPPTargetResolver resolver = new RegistryAPPTargetResolver();
- // abderaServiceContext.setTargetResolver(resolver);
- // AbstractSingletonProviderManager pm = new
RegistryAtomProviderManager();
- // abderaServiceContext.setProviderManager(pm);
- //
- // server = new Server(9090);
- // Context root = new Context(server, "/wso2registry",
Context.NO_SESSIONS);
- // root.addServlet(new ServletHolder(new AbderaServlet() {
- //
- // @Override
- // protected ServiceContext createServiceContext() {
- //
abderaServiceContext.setDefaultProviderManager(RegistryAtomProviderManager.class.getName());
- //
abderaServiceContext.setDefaultTargetResolver(RegistryAPPTargetResolver.class.getName());
- // abderaServiceContext.init(getAbdera(),
getProperties(getServletConfig()));
- // JDBCRegistry jdbcRegistry = null;
- // try {
- // Realm registryRealm =
- // RegistryRealm.createInMemoryRegistryRealm();
- // jdbcRegistry = new JDBCRegistry();
- // jdbcRegistry.init(registryRealm);
- // System.getProperties().put(RegistryConstants.REGISTRY,
jdbcRegistry);
- // } catch (RegistryException e) {
- // e.printStackTrace();
- // }
- // registry = jdbcRegistry;
- // return abderaServiceContext;
- // }
- //
- // public void init() throws ServletException {
- // super.init();
- // System.out.println("done");
- // }
- // }), "/*");
- // server.start();
- //
- //}
-
-
+ }
}
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
