Author: deepal
Date: Mon Jan 21 03:13:48 2008
New Revision: 12614
Log:
get the build working
- added a way to specify the type of DB using system property
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryServer.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/CommentTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/RatingTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/TaggingTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryServer.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryServer.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryServer.java
Mon Jan 21 03:13:48 2008
@@ -55,6 +55,7 @@
}
public void start() throws Exception {
+ System.setProperty("in-memory","true");
RegistryAPPTargetResolver resolver = new RegistryAPPTargetResolver();
abderaServiceContext.setTargetResolver(resolver);
AbstractSingletonProviderManager pm = new
RegistryAtomProviderManager();
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
Mon Jan 21 03:13:48 2008
@@ -78,8 +78,8 @@
setAttribute(RegistryConstants.REGISTRY_CONFIG,
registryConfigurationProcessor);
DataBaseConfiguration dbConfiguration =
registryContext.getDefaultDataBaseConfiguration();
-
- if (dbConfiguration.getConfigName().equals("in-memory")) {
+ String dbType = System.getProperty("in-memory");
+ if ((dbType!=null && "true".equals(dbType))||
dbConfiguration.getConfigName().equals("in-memory")) {
registryRealm = new InMemoryRegistryRealm();
coreRegistry = new InMemoryJDBCRegistry(registryRealm);
} else {
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/CommentTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/CommentTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/CommentTest.java
Mon Jan 21 03:13:48 2008
@@ -28,7 +28,7 @@
try {
if (registry == null) {
server.start();
- registry = new RemoteRegistry(new
URL("http://localhost:8080/wso2registry/atom";), "admin", "admin");
+ registry = new RemoteRegistry(new
URL("http://localhost:8081/wso2registry/atom";), "admin", "admin");
}
} catch (Exception e) {
fail("Failed to initialize the registry.");
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/RatingTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/RatingTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/RatingTest.java
Mon Jan 21 03:13:48 2008
@@ -7,13 +7,7 @@
import java.net.URL;
-/*
- * Created by IntelliJ IDEA.
- * User: krishantha
- * Date: Jan 18, 2008
- * Time: 8:57:09 AM
- * To change this template use File | Settings | File Templates.
- */
+
public class RatingTest extends TestCase {
RegistryServer server = new RegistryServer();
@@ -23,7 +17,7 @@
try {
if (registry == null) {
server.start();
- registry = new RemoteRegistry(new
URL("http://localhost:8080/wso2registry/atom";), "admin", "admin");
+ registry = new RemoteRegistry(new
URL("http://localhost:8081/wso2registry/atom";), "admin", "admin");
}
} catch (Exception e) {
fail("Failed to initialize the registry.");
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/TaggingTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/TaggingTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/TaggingTest.java
Mon Jan 21 03:13:48 2008
@@ -6,13 +6,7 @@
import java.net.URL;
-/**
- * Created by IntelliJ IDEA.
- * User: krishantha
- * Date: Jan 17, 2008
- * Time: 7:28:19 AM
- * To change this template use File | Settings | File Templates.
- */
+
public class TaggingTest extends TestCase {
@@ -24,7 +18,7 @@
try {
if (registry == null) {
server.start();
- registry = new RemoteRegistry(new
URL("http://localhost:8080/wso2registry/atom";), "admin", "admin");
+ registry = new RemoteRegistry(new
URL("http://localhost:8081/wso2registry/atom";), "admin", "admin");
}
} catch (Exception e) {
fail("Failed to initialize the registry.");
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
Mon Jan 21 03:13:48 2008
@@ -35,7 +35,7 @@
try {
if (registry == null) {
server.start();
- registry = new RemoteRegistry(new
URL("http://localhost:8080/wso2registry/atom";), "admin", "admin");
+ registry = new RemoteRegistry(new
URL("http://localhost:8081/wso2registry/atom";), "admin", "admin");
}
} catch (Exception e) {
fail("Failed to initialize the registry.");
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
