Author: ivol37 at gmail.com
Date: Wed Nov 10 15:31:01 2010
New Revision: 359
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Modified:
trunk/amdatu-core/cassandra-useradminstore/pom.xml
trunk/amdatu-core/config-filebased/pom.xml
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
Modified: trunk/amdatu-core/cassandra-useradminstore/pom.xml
==============================================================================
--- trunk/amdatu-core/cassandra-useradminstore/pom.xml (original)
+++ trunk/amdatu-core/cassandra-useradminstore/pom.xml Wed Nov 10 15:31:01 2010
@@ -76,9 +76,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.core.useradmin.store.cassandra.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.core.useradmin.store.cassandra</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.core.useradmin.store.cassandra</Export-Package>
+
<Bundle-Activator>org.amdatu.core.cassandra.useradminstore.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.core.cassandra.useradminstore</Bundle-SymbolicName>
+
<Export-Package>org.amdatu.core.cassandra.useradminstore</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified: trunk/amdatu-core/config-filebased/pom.xml
==============================================================================
--- trunk/amdatu-core/config-filebased/pom.xml (original)
+++ trunk/amdatu-core/config-filebased/pom.xml Wed Nov 10 15:31:01 2010
@@ -39,9 +39,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.configuration.filebased.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.configuration.filebased</Bundle-SymbolicName>
-
<Private-Package>org.amdatu.configuration.filebased</Private-Package>
+
<Bundle-Activator>org.amdatu.core.config.filebased.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.core.config.filebased</Bundle-SymbolicName>
+
<Private-Package>org.amdatu.core.config.filebased</Private-Package>
</instructions>
</configuration>
</plugin>
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Wed Nov 10 15:31:01 2010
@@ -277,7 +277,7 @@
}
protected static MavenArtifactProvisionOption
amdatuUserAdminCassandraStore() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("useradmin-cassandra-store").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core.cassandra").artifactId("useradminstore").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuTenantService() {
@@ -285,15 +285,15 @@
}
protected static MavenArtifactProvisionOption
amdatuCassandraPersistenceManager() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("cassandra-persistencemanager").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core.cassandra").artifactId("persistencemanager").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuCassandraListener() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("cassandra-listener").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core.cassandra").artifactId("listener").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuCassandraApplication()
{
- return
mavenBundle().groupId("org.amdatu.core").artifactId("cassandra-application").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core.cassandra").artifactId("application").versionAsInProject();
}
protected static MavenArtifactProvisionOption
amdatuConfigTemplateManager() {
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
Wed Nov 10 15:31:01 2010
@@ -25,7 +25,7 @@
import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.ColumnType;
import org.amdatu.core.cassandra.listener.ColumnFamilyDefinition.CompareType;
import
org.amdatu.core.cassandra.persistencemanager.CassandraPersistenceManager;
-import org.amdatu.core.configtemplatemanager.ConfigTemplateManager;
+import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.web.httpcontext.HttpContextServiceFactory;
import org.amdatu.test.integration.base.IntegrationTestBase;
import org.apache.cassandra.thrift.InvalidRequestException;
@@ -44,7 +44,7 @@
/**
* This class provides an integration test for the Cassandra Daemon service.
- *
+ *
* @author ivol
*/
@RunWith(JUnit4TestRunner.class)
@@ -112,8 +112,8 @@
// Case sensitivity check: Cassandra is case-sensitive!
m_daemonService.addKeyspace(KEYSPACE.toLowerCase());
m_daemonService.addKeyspace(KEYSPACE.toUpperCase());
-
- // Sleep a second, this increases the probability that write requests
have been handled
+
+ // Sleep a second, this increases the probability that write requests
have been handled
Thread.sleep(1000);
// Get all keyspaces and check that all three have been created
@@ -145,9 +145,9 @@
m_daemonService.addColumnFamily(KEYSPACE, COLUMNFAMILY.toUpperCase(),
ColumnType.STANDARD.value,
CompareType.BYTESTYPE.value, CompareType.BYTESTYPE.value);
- // Sleep a second, this increases the probability that write requests
have been handled
+ // Sleep a second, this increases the probability that write requests
have been handled
Thread.sleep(1000);
-
+
List<String> allColumnFamilies =
m_daemonService.getColumnFamilies(KEYSPACE);
Assert.assertTrue(allColumnFamilies.contains(COLUMNFAMILY));
Assert.assertTrue(allColumnFamilies.contains(COLUMNFAMILY.toLowerCase()));
