Author: [email protected]
Date: Mon Jan 23 12:28:44 2012
New Revision: 1966
Log:
AMDATU-411 Decoupled config.templates from build & itest
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
trunk/amdatu-core/itest/pom.xml
trunk/amdatu-core/pom.xml
trunk/amdatu-release/pom.xml
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
==============================================================================
---
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
(original)
+++
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
Mon Jan 23 12:28:44 2012
@@ -40,7 +40,6 @@
USERADMINSTORE_FS("org.amdatu.core",
"org.amdatu.core.useradminstore.fs"),
USERADMINSTORE_PREFS("org.amdatu.core",
"org.amdatu.core.useradminstore.prefs"),
ITEST_BASE("org.amdatu.core", "org.amdatu.core.itest.base"),
- CONFIG_TEMPLATES("org.amdatu.core",
"org.amdatu.core.config.templates"),
LOG_CONSOLE("org.amdatu.core", "org.amdatu.core.log.console"),
LOG_FORWARDER_JDK("org.amdatu.core",
"org.amdatu.core.log.forwarder.jdk"),
TENANT("org.amdatu.core", "org.amdatu.core.tenant"),
@@ -70,7 +69,6 @@
public enum Configs {
LOGHANDLER("org.amdatu.core.loghandler", logHandlerCnf(), false),
- CONFIGTEMPLATEMANAGER("org.amdatu.core.loghandler",
configTemplateManagerCnf(), false),
TENANT("org.amdatu.core.tenant.factory", tenantCnf(), true);
private final String m_pid;
@@ -101,14 +99,6 @@
return properties;
}
- private static Properties configTemplateManagerCnf() {
- Properties properties = new Properties();
- properties.put("workdir", "config-template-manager");
- properties.put("hostname", "localhost");
- properties.put("port", "8080");
- return properties;
- }
-
private static Properties tenantCnf() {
Properties properties = new Properties();
properties.put("id", "Default");
Modified: trunk/amdatu-core/itest/pom.xml
==============================================================================
--- trunk/amdatu-core/itest/pom.xml (original)
+++ trunk/amdatu-core/itest/pom.xml Mon Jan 23 12:28:44 2012
@@ -210,13 +210,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.config.templates</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
<artifactId>org.amdatu.core.log.console</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
@@ -358,11 +351,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.config.templates</artifactId>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
<artifactId>org.amdatu.core.log.console</artifactId>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml (original)
+++ trunk/amdatu-core/pom.xml Mon Jan 23 12:28:44 2012
@@ -86,7 +86,6 @@
<module>useradminstore-prefs</module>
<module>deployment-tenantconf</module>
<module>fileinstall-autoconf</module>
- <module>config-templates</module>
<module>log-console</module>
<module>log-forwarder-jdk</module>
<module>tenant</module>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Mon Jan 23 12:28:44 2012
@@ -171,13 +171,6 @@
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.config.templates</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
<artifactId>org.amdatu.core.log.console</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>runtime</scope>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
