svn commit: r383428 - in /incubator/felix/sandbox/akarasulu/mavenized: installers/ installers/src/main/installers/ org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/ org.apache.felix.main/src/main/java/org/apache/felix/daemon/ org.apache.fe...

[ak...@apache.org]

Author: akarasulu
Date: Sun Mar  5 14:46:32 2006
New Revision: 383428

URL: http://svn.apache.org/viewcvs?rev=383428&view=rev
Log:
getting build to work

Added:
    incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
      - copied, changed from r383421, incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/DaemonService.java
    incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/main/
      - copied from r383424, incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/daemon/
Removed:
    incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/DaemonService.java
    incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/daemon/
    incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/main/DaemonService.java
    incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/main/FelixLayout.java
Modified:
    incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml
    incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/bootstrapper.properties
    incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java
    incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/main/Main.java

Modified: incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml?rev=383428&r1=383427&r2=383428&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml Sun Mar  5 14:46:32 2006
@@ -95,7 +95,7 @@
           <packageDocs>true</packageDocs>
           -->
           <applicationClass>
-            org.apache.felix.framework.DaemonService
+            org.apache.felix.daemon.Service
           </applicationClass>
 <!--
           <rpmTargets>

Modified: incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/bootstrapper.properties
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/bootstrapper.properties?rev=383428&r1=383427&r2=383428&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/bootstrapper.properties (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/bootstrapper.properties Sun Mar  5 14:46:32 2006
@@ -1,2 +1,2 @@
-bootstrap.start.class=org.apache.felix.framework.DaemonService
-bootstrap.stop.class=org.apache.felix.framework.DaemonService
+bootstrap.start.class=org.apache.felix.daemon.Service
+bootstrap.stop.class=org.apache.felix.daemon.Service

Modified: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java?rev=383428&r1=383427&r2=383428&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java Sun Mar  5 14:46:32 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.felix.framework;
+package org.apache.felix.daemon;
 
 
 import java.io.File;

Copied: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java (from r383421, incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/DaemonService.java)
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java?p2=incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java&p1=incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/DaemonService.java&r1=383421&r2=383428&rev=383428&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/DaemonService.java (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java Sun Mar  5 14:46:32 2006
@@ -1,11 +1,9 @@
-package org.apache.felix.framework;
+package org.apache.felix.daemon;
 
 
-import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
@@ -13,6 +11,8 @@
 
 import org.apache.directory.daemon.DaemonApplication;
 import org.apache.directory.daemon.InstallationLayout;
+
+import org.apache.felix.framework.Felix;
 import org.apache.felix.framework.cache.DefaultBundleCache;
 import org.apache.felix.framework.util.MutablePropertyResolverImpl;
 import org.apache.felix.framework.util.StringMap;
@@ -22,7 +22,7 @@
  * NOTE: Does not set system properties which are done via a daemon ui, some
  * init script, or a main() application entry point.
  */
-public class DaemonService implements DaemonApplication
+public class Service implements DaemonApplication
 {
     /**
      * The system property name used to specify an URL to the configuration

Modified: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/main/Main.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/main/Main.java?rev=383428&r1=383424&r2=383428&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/main/Main.java (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/src/main/java/org/apache/felix/main/Main.java Sun Mar  5 14:46:32 2006
@@ -14,7 +14,8 @@
  *   limitations under the License.
  *
  */
-package org.apache.felix.framework;
+package org.apache.felix.main;
+
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -23,7 +24,10 @@
 import java.util.Properties;
 
 import org.apache.directory.daemon.InstallationLayout;
+
 import org.apache.felix.framework.cache.DefaultBundleCache;
+import org.apache.felix.daemon.Service;
+
 
 /**
  * <p>
@@ -130,7 +134,7 @@
         Main.loadSystemProperties();
 
         // Initialize the Felix Daemon/Service
-        DaemonService service = new DaemonService();
+        Service service = new Service();
         if ( argv.length > 0 && new File( argv[0] ).isDirectory() )
         {
             service.init( new InstallationLayout( argv[0] ), null );
@@ -297,7 +301,7 @@
         for (Enumeration e = props.propertyNames(); e.hasMoreElements(); )
         {
             String name = (String) e.nextElement();
-            System.setProperty( name, DaemonService.substVars( ( String ) props.getProperty( name ) ) );
+            System.setProperty( name, Service.substVars( ( String ) props.getProperty( name ) ) );
         }
     }
 }