Author: bdekruijff at gmail.com
Date: Thu Jan 13 19:27:58 2011
New Revision: 625
Log:
AMDATU-207 getting rid of utilities dependency should fix build *hope*
Modified:
trunk/amdatu-core/tenant/pom.xml
trunk/amdatu-core/tenantstore-fs/pom.xml
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/internal/FSTenantStorage.java
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/internal/FSTenantStore.java
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProviderTest.java
Modified: trunk/amdatu-core/tenant/pom.xml
==============================================================================
--- trunk/amdatu-core/tenant/pom.xml (original)
+++ trunk/amdatu-core/tenant/pom.xml Thu Jan 13 19:27:58 2011
@@ -18,7 +18,7 @@
<groupId>org.amdatu.libraries</groupId>
<artifactId>utilities</artifactId>
<version>${platform.version}</version>
- <scope>compile</scope>
+ <scope>test</scope>
<type>jar</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-core/tenantstore-fs/pom.xml
==============================================================================
--- trunk/amdatu-core/tenantstore-fs/pom.xml (original)
+++ trunk/amdatu-core/tenantstore-fs/pom.xml Thu Jan 13 19:27:58 2011
@@ -39,6 +39,7 @@
<Bundle-Activator>org.amdatu.core.tenantstore.fs.osgi.FSTenantStorageProviderActivator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.core.tenantstore-fs</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Export-Package/>
</instructions>
</configuration>
</plugin>
Modified:
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/internal/FSTenantStorage.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/internal/FSTenantStorage.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/internal/FSTenantStorage.java
Thu Jan 13 19:27:58 2011
@@ -21,7 +21,6 @@
import org.amdatu.libraries.fsstorage.FSStorageBase;
-
public class FSTenantStorage extends FSStorageBase<FSTenantStore,
FSTenantEntity> {
private static final String ENTITYLIST_FILENAME = "tenantIdList.ser";
Modified:
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/internal/FSTenantStore.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/internal/FSTenantStore.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/internal/FSTenantStore.java
Thu Jan 13 19:27:58 2011
@@ -24,8 +24,8 @@
import java.util.Map;
import org.amdatu.core.tenant.TenantEntity;
+import org.amdatu.libraries.fsstorage.FSStorageUtil;
import org.amdatu.libraries.fsstorage.FSStoreBase;
-import org.amdatu.libraries.utilities.FSUtil;
/**
* Implementation of a persistent tenant store (containing 0 or more tenants)
on disk.
@@ -38,16 +38,16 @@
protected FSTenantEntity readEntity(ObjectInputStream ois) throws
IOException,
UnsupportedEncodingException {
- final String id = FSUtil.readString(ois);
- final String name = FSUtil.readString(ois);
- final Map<String, String> properties = FSUtil.readProperties(ois);
+ final String id = FSStorageUtil.readString(ois);
+ final String name = FSStorageUtil.readString(ois);
+ final Map<String, String> properties =
FSStorageUtil.readProperties(ois);
return new FSTenantEntity(new TenantEntity(id, name, properties));
}
protected void writeEntity(ObjectOutputStream oos, FSTenantEntity entity)
throws UnsupportedEncodingException,
IOException {
- FSUtil.writeString(oos, entity.getTenantEntity().getId());
- FSUtil.writeString(oos, entity.getTenantEntity().getName());
- FSUtil.writeProperties(oos, entity.getTenantEntity().getProperties());
+ FSStorageUtil.writeString(oos, entity.getTenantEntity().getId());
+ FSStorageUtil.writeString(oos, entity.getTenantEntity().getName());
+ FSStorageUtil.writeProperties(oos,
entity.getTenantEntity().getProperties());
}
}
Modified:
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/main/java/org/amdatu/core/tenantstore/fs/osgi/FSTenantStorageProviderActivator.java
Thu Jan 13 19:27:58 2011
@@ -19,7 +19,6 @@
import org.amdatu.core.tenant.TenantStorageProvider;
import org.amdatu.core.tenantstore.fs.service.FSTenantStorageProvider;
-import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.osgi.framework.BundleContext;
Modified:
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProviderTest.java
==============================================================================
---
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProviderTest.java
(original)
+++
trunk/amdatu-core/tenantstore-fs/src/test/java/org/amdatu/core/tenantstore/fs/service/FSTenantStorageProviderTest.java
Thu Jan 13 19:27:58 2011
@@ -23,7 +23,7 @@
private static File m_absoluteTestRootDirectory;
private static String m_relativeTestRootDirectory;
-
+
@Rule
public TestName m_testName = new TestName();
