Author: mes
Date: 2009-07-24 13:14:50 -0700 (Fri, 24 Jul 2009)
New Revision: 17557
Added:
core3/cmdline-application/trunk/cmdline-logging/
core3/cmdline-application/trunk/cmdline-logging/assembly.xml
core3/cmdline-application/trunk/cmdline-logging/pom.xml
core3/cmdline-application/trunk/src/
core3/cmdline-application/trunk/src/main/
core3/cmdline-application/trunk/src/main/resources/
core3/cmdline-application/trunk/src/main/resources/configurations/
core3/cmdline-application/trunk/src/main/resources/configurations/factories/
core3/cmdline-application/trunk/src/main/resources/configurations/services/
core3/cmdline-application/trunk/src/main/resources/configurations/services/org.ops4j.pax.logging.properties
Modified:
core3/cmdline-application/trunk/assembly.xml
core3/cmdline-application/trunk/cmdline-launcher/pom.xml
core3/cmdline-application/trunk/cmdline-launcher/src/main/java/org/cytoscape/cmdline/launcher/internal/Launcher.java
core3/cmdline-application/trunk/cmdline-launcher/src/main/resources/conf/config.properties
core3/cmdline-application/trunk/cmdline-provision/pom.xml
core3/cmdline-application/trunk/pom.xml
Log:
configured the system so that all logging is disabled
Modified: core3/cmdline-application/trunk/assembly.xml
===================================================================
--- core3/cmdline-application/trunk/assembly.xml 2009-07-24 20:00:37 UTC
(rev 17556)
+++ core3/cmdline-application/trunk/assembly.xml 2009-07-24 20:14:50 UTC
(rev 17557)
@@ -21,12 +21,6 @@
<include>org.cytoscape:cmdline-provision</include>
</includes>
<binaries>
- <!--
- <outputDirectory>${artifactId}/load</outputDirectory>
- <unpack>false</unpack>
- -->
- <!--
- -->
<dependencySets>
<dependencySet>
<outputDirectory>${artifactId}/load</outputDirectory>
@@ -37,5 +31,29 @@
</dependencySets>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.cytoscape:cmdline-logging</include>
+ </includes>
+ <binaries>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>${artifactId}/bundles</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
</moduleSets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>${artifactId}</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
Modified: core3/cmdline-application/trunk/cmdline-launcher/pom.xml
===================================================================
--- core3/cmdline-application/trunk/cmdline-launcher/pom.xml 2009-07-24
20:00:37 UTC (rev 17556)
+++ core3/cmdline-application/trunk/cmdline-launcher/pom.xml 2009-07-24
20:14:50 UTC (rev 17557)
@@ -104,11 +104,6 @@
<artifactId>org.apache.felix.main</artifactId>
<version>${felix.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>1.0.0</version>
- </dependency>
</dependencies>
</project>
Modified:
core3/cmdline-application/trunk/cmdline-launcher/src/main/java/org/cytoscape/cmdline/launcher/internal/Launcher.java
===================================================================
---
core3/cmdline-application/trunk/cmdline-launcher/src/main/java/org/cytoscape/cmdline/launcher/internal/Launcher.java
2009-07-24 20:00:37 UTC (rev 17556)
+++
core3/cmdline-application/trunk/cmdline-launcher/src/main/java/org/cytoscape/cmdline/launcher/internal/Launcher.java
2009-07-24 20:14:50 UTC (rev 17557)
@@ -41,7 +41,6 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.felix.fileinstall.FileInstall;
import org.apache.felix.framework.Felix;
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.framework.util.StringMap;
@@ -51,8 +50,7 @@
/**
- * A class that launches Felix and automatically starts the FileInstall
- * bundle as well as starting a CommandLineProvider service.
+ * A class that launches Felix and starts a CommandLineProvider service.
*/
public class Launcher {
@@ -63,6 +61,9 @@
*/
public static void main(String[] args) {
+ // This sets a system level property so that no logs are spewed
at startup
+
System.setProperty("org.ops4j.pax.logging.DefaultServiceLog.level","NONE");
+
// Tell felix where the config file is.
System.setProperty(Main.CONFIG_PROPERTIES_PROP,
Launcher.class.getResource("/conf/config.properties").toString());
@@ -81,7 +82,6 @@
// Create a list of bundles to start automatically.
List<BundleActivator> list = new ArrayList<BundleActivator>();
list.add(new AutoActivator(configProps)); // from config
auto.start
- list.add(new FileInstall());
list.add(new CommandLineProviderImpl(args));
configProps.put(FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP,
list);
// Create a case-insensitive property map.
Modified:
core3/cmdline-application/trunk/cmdline-launcher/src/main/resources/conf/config.properties
===================================================================
---
core3/cmdline-application/trunk/cmdline-launcher/src/main/resources/conf/config.properties
2009-07-24 20:00:37 UTC (rev 17556)
+++
core3/cmdline-application/trunk/cmdline-launcher/src/main/resources/conf/config.properties
2009-07-24 20:14:50 UTC (rev 17557)
@@ -26,27 +26,27 @@
org.cytoscape.cmdline.launcher \
${jre-${java.specification.version}}
-
-#org.osgi.framework.bootdelegation=sun.*,com.sun.*
-#felix.cache.profile=foo
-#felix.auto.start.1= \
-# file:bundle/org.apache.felix.shell_1.2.0.jar \
-# file:bundle/org.apache.felix.shell.tui_1.2.0.jar \
-# file:bundle/org.apache.felix.fileinstall_1.0.0.jar
+felix.auto.start.1= \
+ file:bundles/org.osgi.compendium-1.2.0.jar \
+ file:bundles/org.apache.felix.configadmin-1.0.10.jar \
+ file:bundles/pax-confman-propsloader-0.2.2.jar \
+ file:bundles/pax-logging-api-1.3.0.jar \
+ file:bundles/pax-logging-service-1.3.0.jar
+felix.auto.start.2= \
+ file:bundles/org.apache.felix.fileinstall-1.0.0.jar
+
felix.log.level=0
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
+org.osgi.framework.startlevel.beginning=6
+felix.startlevel.bundle=5
felix.fragment.validation=warning
-#felix.service.urlhandlers=false
#
# Bundle config properties.
#
org.osgi.service.http.port=8080
osgi.shell.telnet=on
-#obr.repository.url=http://bundles.osgi.org/obr/browse?_xml=1&cmd=repository
#
Added: core3/cmdline-application/trunk/cmdline-logging/assembly.xml
===================================================================
--- core3/cmdline-application/trunk/cmdline-logging/assembly.xml
(rev 0)
+++ core3/cmdline-application/trunk/cmdline-logging/assembly.xml
2009-07-24 20:14:50 UTC (rev 17557)
@@ -0,0 +1,15 @@
+<assembly>
+ <id>cmdline-logging</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/bundle</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added: core3/cmdline-application/trunk/cmdline-logging/pom.xml
===================================================================
--- core3/cmdline-application/trunk/cmdline-logging/pom.xml
(rev 0)
+++ core3/cmdline-application/trunk/cmdline-logging/pom.xml 2009-07-24
20:14:50 UTC (rev 17557)
@@ -0,0 +1,74 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <parent>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>cmdline-application</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>cmdline-logging</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <packaging>jar</packaging>
+
+ <name>cmdline-application imported bundles</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.ops4j.pax.confman</groupId>
+ <artifactId>pax-confman-propsloader</artifactId>
+ <version>0.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: core3/cmdline-application/trunk/cmdline-provision/pom.xml
===================================================================
--- core3/cmdline-application/trunk/cmdline-provision/pom.xml 2009-07-24
20:00:37 UTC (rev 17556)
+++ core3/cmdline-application/trunk/cmdline-provision/pom.xml 2009-07-24
20:14:50 UTC (rev 17557)
@@ -104,7 +104,7 @@
</dependency>
-<!-- only if you want a shell! -->
+<!-- only if you want a shell!
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
@@ -115,9 +115,10 @@
<artifactId>org.apache.felix.shell.tui</artifactId>
<version>1.2.0</version>
</dependency>
+-->
- <!-- pax logging -->
+ <!-- pax logging
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
@@ -133,6 +134,7 @@
<artifactId>org.osgi.compendium</artifactId>
<version>1.2.0</version>
</dependency>
+ -->
<!-- cytoscape data model -->
Modified: core3/cmdline-application/trunk/pom.xml
===================================================================
--- core3/cmdline-application/trunk/pom.xml 2009-07-24 20:00:37 UTC (rev
17556)
+++ core3/cmdline-application/trunk/pom.xml 2009-07-24 20:14:50 UTC (rev
17557)
@@ -48,6 +48,7 @@
<modules>
<module>cmdline-launcher</module>
<module>cmdline-provision</module>
+ <module>cmdline-logging</module>
</modules>
</project>
Added:
core3/cmdline-application/trunk/src/main/resources/configurations/services/org.ops4j.pax.logging.properties
===================================================================
---
core3/cmdline-application/trunk/src/main/resources/configurations/services/org.ops4j.pax.logging.properties
(rev 0)
+++
core3/cmdline-application/trunk/src/main/resources/configurations/services/org.ops4j.pax.logging.properties
2009-07-24 20:14:50 UTC (rev 17557)
@@ -0,0 +1,17 @@
+#---
+# Excerpted from "Modular Java",
+# published by The Pragmatic Bookshelf.
+# Copyrights apply to this code. It may not be used to create training
material,
+# courses, books, articles, and the like. Contact us if you are in doubt.
+# We make no guarantees that this code is fit for any purpose.
+# Visit http://www.pragmaticprogrammer.com/titles/cwosg for more book
information.
+#---
+log4j.rootLogger=OFF, file
+
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.threshold=INFO
+log4j.appender.file.File=/Users/mes/dude.log
+#log4j.appender.file.MaxBackupIndex=20
+#log4j.appender.file.MaxFileSize=20MB
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---
