Author: [email protected]
Date: Thu Nov 24 20:30:17 2011
New Revision: 1774
Log:
AMDATU-397 Couple of OCD changes and small fixes for this to work
Modified:
trunk/amdatu-core/config-templates/src/main/resources/OSGI-INF/metatype/metatype.xml
trunk/amdatu-core/fileinstall-metatype/src/main/java/org/amdatu/core/fileinstall/metatype/internal/MetatypeArtifactInstaller.java
trunk/amdatu-core/log-console/src/main/java/org/amdatu/core/log/console/service/ConsoleLogHandler.java
trunk/amdatu-core/log-console/src/main/resources/OSGI-INF/metatype/metatype.xml
trunk/amdatu-core/useradminstore-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
Modified:
trunk/amdatu-core/config-templates/src/main/resources/OSGI-INF/metatype/metatype.xml
==============================================================================
---
trunk/amdatu-core/config-templates/src/main/resources/OSGI-INF/metatype/metatype.xml
(original)
+++
trunk/amdatu-core/config-templates/src/main/resources/OSGI-INF/metatype/metatype.xml
Thu Nov 24 20:30:17 2011
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <OCD id="org.amdatu.core.config.templates" name="Amdatu Config Templates">
- <AD id="workdir" name="workdir" type="String" description="The work
directory in which temporary configuration files are stored. Note that this
directory becomes a subdirectory of /target/work"/>
- <AD id="hostname" name="hostname" type="String"/>
- <AD id="port" name="port" type="String"/>
- </OCD>
- <Designate pid="org.amdatu.core.config.templates">
- <Object ocdref="org.amdatu.core.config.templates"/>
- </Designate>
+ <OCD id="org.amdatu.core.config.templates" name="Amdatu Config Templates">
+ <AD id="workdir" name="workdir" type="String"
+ description="The work directory in which temporary configuration files
are stored. Note that this directory becomes a subdirectory of /target/work" />
+ </OCD>
+ <Designate pid="org.amdatu.core.config.templates">
+ <Object ocdref="org.amdatu.core.config.templates" />
+ </Designate>
</metatype:MetaData>
\ No newline at end of file
Modified:
trunk/amdatu-core/fileinstall-metatype/src/main/java/org/amdatu/core/fileinstall/metatype/internal/MetatypeArtifactInstaller.java
==============================================================================
---
trunk/amdatu-core/fileinstall-metatype/src/main/java/org/amdatu/core/fileinstall/metatype/internal/MetatypeArtifactInstaller.java
(original)
+++
trunk/amdatu-core/fileinstall-metatype/src/main/java/org/amdatu/core/fileinstall/metatype/internal/MetatypeArtifactInstaller.java
Thu Nov 24 20:30:17 2011
@@ -217,7 +217,7 @@
*/
private boolean isFactoryConfig(Designate designate) {
String factoryPid = designate.getFactoryPid();
- return (factoryPid != null || !"".equals(factoryPid));
+ return (factoryPid != null && !"".equals(factoryPid));
}
/*
Modified:
trunk/amdatu-core/log-console/src/main/java/org/amdatu/core/log/console/service/ConsoleLogHandler.java
==============================================================================
---
trunk/amdatu-core/log-console/src/main/java/org/amdatu/core/log/console/service/ConsoleLogHandler.java
(original)
+++
trunk/amdatu-core/log-console/src/main/java/org/amdatu/core/log/console/service/ConsoleLogHandler.java
Thu Nov 24 20:30:17 2011
@@ -35,7 +35,7 @@
public static final String PID = "org.amdatu.core.log.console";
private static int DEFAULT_LOG_LEVEL = LogService.LOG_DEBUG;
private static final Map<Integer, String> LOG_LEVELS;
- private static final String MIN_LOGLEVEL_KEY = "console.mininum.loglevel";
+ private static final String LOGLEVEL_KEY = "loglevel";
static {
LOG_LEVELS = new HashMap<Integer, String>();
LOG_LEVELS.put(LogService.LOG_DEBUG, "DEBUG");
@@ -74,7 +74,7 @@
return DEFAULT_LOG_LEVEL;
}
- String minLogLevel = (String) dictionary.get(MIN_LOGLEVEL_KEY);
+ String minLogLevel = (String) dictionary.get(LOGLEVEL_KEY);
if (minLogLevel == null) {
return DEFAULT_LOG_LEVEL;
}
Modified:
trunk/amdatu-core/log-console/src/main/resources/OSGI-INF/metatype/metatype.xml
==============================================================================
---
trunk/amdatu-core/log-console/src/main/resources/OSGI-INF/metatype/metatype.xml
(original)
+++
trunk/amdatu-core/log-console/src/main/resources/OSGI-INF/metatype/metatype.xml
Thu Nov 24 20:30:17 2011
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <OCD id="org.amdatu.core.log.console" name="Amdatu Log Console">
- <AD id="console.mininum.loglevel" name="console.mininum.loglevel"
type="String" description="The loglevel of messages that will be printed to the
console. Can be DEBUG, INFO, WARNING or ERROR. For example if 'INFO' is
defined, only log messages will be printed in the console which have a loglevel
of INFO or higher (WARNING or ERROR)." />
- </OCD>
- <Designate pid="org.amdatu.core.log.console">
- <Object ocdref="org.amdatu.core.log.console" />
- </Designate>
+ <OCD id="org.amdatu.core.log.console" name="Amdatu Log Console">
+ <AD id="loglevel" name="Loglevel" type="String" default="INFO"
+ description="The loglevel of messages that will be printed to the
console. Can be DEBUG, INFO, WARNING or ERROR. For example if 'INFO' is
defined, only log messages will be printed in the console which have a loglevel
of INFO or higher (WARNING or ERROR)." />
+ </OCD>
+ <Designate pid="org.amdatu.core.log.console">
+ <Object ocdref="org.amdatu.core.log.console" />
+ </Designate>
</metatype:MetaData>
\ No newline at end of file
Modified:
trunk/amdatu-core/useradminstore-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
==============================================================================
---
trunk/amdatu-core/useradminstore-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
(original)
+++
trunk/amdatu-core/useradminstore-fs/src/main/resources/OSGI-INF/metatype/metatype.xml
Thu Nov 24 20:30:17 2011
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0";>
- <OCD id="org.amdatu.core.useradminstore-fs" name="Amdatu UserAdmin store
FS">
+ <OCD id="org.amdatu.core.useradminstore.fs" name="Amdatu UserAdmin store
FS">
<AD id="datadir" name="datadir" type="String" description="PAX
UserAdmin FS datadirectory"/>
</OCD>
- <Designate pid="org.amdatu.core.useradminstore-fs">
- <Object ocdref="org.amdatu.core.useradminstore-fs"/>
+ <Designate pid="org.amdatu.core.useradminstore.fs">
+ <Object ocdref="org.amdatu.core.useradminstore.fs"/>
</Designate>
</metatype:MetaData>
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
