[Techne-dev-commit] SF.net SVN: techne-dev: [92] sandbox/rickles/org.digivitality.techne.core

[<to...@us...>]

Revision: 92
          http://techne-dev.svn.sourceforge.net/techne-dev/?rev=92&view=rev
Author:   tonit
Date:     2007-03-01 05:08:20 -0800 (Thu, 01 Mar 2007)

Log Message:
-----------
moved Main class to shell project to fix cyclic dep.

Modified Paths:
--------------
    sandbox/rickles/org.digivitality.techne.core/.classpath
    sandbox/rickles/org.digivitality.techne.core/bin/techne.bat
    sandbox/rickles/org.digivitality.techne.core/bin/techne.sh
    sandbox/rickles/org.digivitality.techne.core/src/org/digivitality/techne/launch/felix/FelixLauncher.java

Removed Paths:
-------------
    sandbox/rickles/org.digivitality.techne.core/src/org/digivitality/techne/core/Main.java

Modified: sandbox/rickles/org.digivitality.techne.core/.classpath
===================================================================
--- sandbox/rickles/org.digivitality.techne.core/.classpath	2007-03-01 08:01:39 UTC (rev 91)
+++ sandbox/rickles/org.digivitality.techne.core/.classpath	2007-03-01 13:08:20 UTC (rev 92)
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.9.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.digivitality.techne.shell"/>
 	<classpathentry kind="lib" path="lib/felix.jar" sourcepath="C:/Workspace/Projects/JAVA/ApacheFelix"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Modified: sandbox/rickles/org.digivitality.techne.core/bin/techne.bat
===================================================================
--- sandbox/rickles/org.digivitality.techne.core/bin/techne.bat	2007-03-01 08:01:39 UTC (rev 91)
+++ sandbox/rickles/org.digivitality.techne.core/bin/techne.bat	2007-03-01 13:08:20 UTC (rev 92)
@@ -8,4 +8,4 @@
 set CLASSPATH=../classes;../../org.digivitality.techne.shell/classes;../lib/org.apache.felix.main-0.9.0-incubator-SNAPSHOT.jar;../lib/commons-logging-1.0.4.jar;../lib/log4j-1.2.9.jar;%BUNDLES%;%PROPDIR%;
 set DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=1044,server=y,suspend=y
 
-java -Xms128M -Xmx512M -XX:PermSize=64M -XX:MaxPermSize=128M -Dfelix.config.properties=file:../conf/config.properties org.digivitality.techne.core.Main
+java -Xms128M -Xmx512M -XX:PermSize=64M -XX:MaxPermSize=128M -Dfelix.config.properties=file:../conf/config.properties org.digivitality.techne.shell.Main

Modified: sandbox/rickles/org.digivitality.techne.core/bin/techne.sh
===================================================================
--- sandbox/rickles/org.digivitality.techne.core/bin/techne.sh	2007-03-01 08:01:39 UTC (rev 91)
+++ sandbox/rickles/org.digivitality.techne.core/bin/techne.sh	2007-03-01 13:08:20 UTC (rev 92)
@@ -8,5 +8,5 @@
 PROPDIR=../conf
 BUNDLES=$BUNDLEDIR/org.apache.felix.shell-0.9.0-incubator-SNAPSHOT.jar
 CLASSPATH=../classes:../../org.digivitality.techne.shell/classes:../lib/org.apache.felix.main-0.9.0-incubator-SNAPSHOT.jar:../lib/commons-logging-1.0.4.jar:../lib/log4j-1.2.9.jar:$BUNDLES:$PROPDIR
-echo Launch VM..
-java -cp $CLASSPATH -Xms128M -Xmx512M -XX:PermSize=64M -XX:MaxPermSize=128M -Dfelix.config.properties=file:../conf/config.properties org.digivitality.techne.core.Main
+echo Launch VM with CP: $CLASSPATH
+java -cp $CLASSPATH -Xms128M -Xmx512M -XX:PermSize=64M -XX:MaxPermSize=128M -Dfelix.config.properties=file:../conf/config.properties org.digivitality.techne.shell.Main

Deleted: sandbox/rickles/org.digivitality.techne.core/src/org/digivitality/techne/core/Main.java
===================================================================
--- sandbox/rickles/org.digivitality.techne.core/src/org/digivitality/techne/core/Main.java	2007-03-01 08:01:39 UTC (rev 91)
+++ sandbox/rickles/org.digivitality.techne.core/src/org/digivitality/techne/core/Main.java	2007-03-01 13:08:20 UTC (rev 92)
@@ -1,36 +0,0 @@
-/**
- * 
- */
-package org.digivitality.techne.core;
-
-import org.apache.log4j.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4JLogger;
-
-import org.digivitality.techne.shell.*;
-import org.digivitality.techne.launch.felix.*;
-
-/**
- * Generic starter.
- * 
- * @author Rick Litton
- *
- */
-public class Main {
-
-	static Log logger = LogFactory.getLog(Main.class);
-	
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		(LogFactory.getLog(Main.class)).info("user.dir = " + System.getProperty("user.dir"));
-		Shell container = new Shell();
-        container.init();
-      /* test to run launcher directly */      		
-	    //FelixLauncher l = new FelixLauncher();
-		//l.launch();
-	}
-
-}

Modified: sandbox/rickles/org.digivitality.techne.core/src/org/digivitality/techne/launch/felix/FelixLauncher.java
===================================================================
--- sandbox/rickles/org.digivitality.techne.core/src/org/digivitality/techne/launch/felix/FelixLauncher.java	2007-03-01 08:01:39 UTC (rev 91)
+++ sandbox/rickles/org.digivitality.techne.core/src/org/digivitality/techne/launch/felix/FelixLauncher.java	2007-03-01 13:08:20 UTC (rev 92)
@@ -1,16 +1,13 @@
 package org.digivitality.techne.launch.felix;
 
-import java.io.*;
-import java.util.*;
+import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.felix.framework.Felix;
+import org.apache.felix.framework.util.MutablePropertyResolverImpl;
+import org.apache.felix.framework.util.StringMap;
 import org.apache.felix.main.Main;
-import org.apache.felix.framework.util.*;
-import org.digivitality.techne.shell.Shell;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.