Author: [email protected]
Date: Tue Jan 31 16:46:07 2012
New Revision: 2045
Log:
AMDATU-510 Decoupled platform from log.console module
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreBundles.java
trunk/amdatu-core/itest/pom.xml
trunk/amdatu-core/pom.xml
trunk/amdatu-kitchensink/release-server/pom.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-minimal/amdatu-core-config.xml
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-multitenant/amdatu-core-config.xml
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreBundles.java
==============================================================================
---
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreBundles.java
(original)
+++
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreBundles.java
Tue Jan 31 16:46:07 2012
@@ -38,7 +38,6 @@
USERADMIN("org.amdatu.core", "org.amdatu.core.useradmin"),
USERADMINSTORE_PREFS("org.amdatu.core",
"org.amdatu.core.useradminstore.prefs"),
ITEST_BASE("org.amdatu.core", "org.amdatu.core.itest.base"),
- LOG_CONSOLE("org.amdatu.core", "org.amdatu.core.log.console"),
TENANT("org.amdatu.tenant", "org.amdatu.tenant"),
TENANT_ADAPTER("org.amdatu.tenant", "org.amdatu.tenant.adapter"),
TENANT_FACTORY("org.amdatu.tenant", "org.amdatu.tenant.factory");
Modified: trunk/amdatu-core/itest/pom.xml
==============================================================================
--- trunk/amdatu-core/itest/pom.xml (original)
+++ trunk/amdatu-core/itest/pom.xml Tue Jan 31 16:46:07 2012
@@ -232,13 +232,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.log.console</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant</artifactId>
<version>${project.version}</version>
@@ -356,11 +349,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.log.console</artifactId>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant</artifactId>
<type>bundle</type>
Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml (original)
+++ trunk/amdatu-core/pom.xml Tue Jan 31 16:46:07 2012
@@ -86,7 +86,6 @@
<module>useradminstore-prefs</module>
<module>deployment-tenantconf</module>
<module>fileinstall-autoconf</module>
- <module>log-console</module>
<module>tenant</module>
<module>tenant-adapter</module>
<module>tenant-factory</module>
Modified: trunk/amdatu-kitchensink/release-server/pom.xml
==============================================================================
--- trunk/amdatu-kitchensink/release-server/pom.xml (original)
+++ trunk/amdatu-kitchensink/release-server/pom.xml Tue Jan 31 16:46:07 2012
@@ -147,16 +147,7 @@
<artifactId>pax-useradmin-provider-preferences</artifactId>
<version>${pax.useradmin.version}</version>
<scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.log.console</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
-
+ </dependency>
<!-- Multi-Tenancy components -->
<dependency>
Modified:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-minimal/amdatu-core-config.xml
==============================================================================
---
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-minimal/amdatu-core-config.xml
(original)
+++
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-minimal/amdatu-core-config.xml
Tue Jan 31 16:46:07 2012
@@ -1,10 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <Designate pid="org.amdatu.core.log.console">
- <Object ocdref="org.amdatu.core.log.console">
- <Attribute adref="loglevel">
- <Value>INFO</Value>
- </Attribute>
- </Object>
- </Designate>
</MetaData>
\ No newline at end of file
Modified:
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-multitenant/amdatu-core-config.xml
==============================================================================
---
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-multitenant/amdatu-core-config.xml
(original)
+++
trunk/amdatu-kitchensink/release-server/src/main/resources/config/platform-multitenant/amdatu-core-config.xml
Tue Jan 31 16:46:07 2012
@@ -1,10 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <Designate pid="org.amdatu.core.log.console">
- <Object ocdref="org.amdatu.core.log.console">
- <Attribute adref="loglevel">
- <Value>INFO</Value>
- </Attribute>
- </Object>
- </Designate>
</MetaData>
\ No newline at end of file
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Jan 31 16:46:07 2012
@@ -171,20 +171,6 @@
<dependency>
<groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.log.console</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.forwarder.jdk</artifactId>
- <version>${org.amdatu.core.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
<artifactId>org.amdatu.core.eventadmin</artifactId>
<version>${org.amdatu.core.version}</version>
<scope>compile</scope>
Modified: trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
==============================================================================
--- trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
(original)
+++ trunk/amdatu-release/src/main/resources/config/amdatu-core-config.xml
Tue Jan 31 16:46:07 2012
@@ -1,10 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <Designate pid="org.amdatu.core.log.console">
- <Object ocdref="org.amdatu.core.log.console">
- <Attribute adref="loglevel">
- <Value>INFO</Value>
- </Attribute>
- </Object>
- </Designate>
</MetaData>
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
