incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r394735 [3/4] - in /incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi: core/agent/ core/agent/callable/ core/agent/callable/context/ core/agent/callable/tomcat/ core/agent/dao/ core/agent/interfaces/ core/agent/jmx/ core/agent/job/ c...
Date Mon, 17 Apr 2006 17:36:32 GMT
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 import java.sql.SQLException;
 import java.util.Collection;
@@ -29,5 +29,3 @@
   Collection<T> getObjects(Class<T> c, boolean cache, String statement, Object... params) throws SQLException;
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 import java.util.Map;
 
@@ -50,5 +50,3 @@
   }
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 /**
  * @author Stephen Toback

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Server.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Server.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Server.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Server.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 /**
  * @author Stephen Toback
@@ -22,8 +22,6 @@
 public interface Server {
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCBroker.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCBroker.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCBroker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCBroker.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 import java.sql.SQLException;
 
@@ -38,5 +38,3 @@
   String connectionReport();
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCConstants.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCConstants.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCConstants.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCConstants.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 /**
  * @author Stephen Toback
@@ -30,8 +30,6 @@
   String METHOD_UPDATE = "update";
   String METHOD_DELETE = "delete";
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCDao.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCDao.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCDao.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCDao.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 import java.sql.SQLException;
 
@@ -24,5 +24,3 @@
 public abstract class TMCDao<T extends TMCDao> extends RestObject implements Dao<T>, Collectable {
   public abstract T get(int id) throws SQLException;
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCMessage.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCMessage.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCMessage.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/TMCMessage.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 /**
  * @author Stephen Toback
@@ -22,8 +22,6 @@
 public interface TMCMessage {
   boolean send();
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/XMLDao.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/XMLDao.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/XMLDao.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/XMLDao.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.interfaces;
+package org.apache.lokahi.core.common.interfaces;
 
 import org.jdom.Element;
 
@@ -24,5 +24,3 @@
 public abstract class XMLDao<T extends XMLDao> extends TMCDao<T> {
   public abstract T fillObject(Element el);
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/Message.java Mon Apr 17 10:36:22 2006
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.message;
+package org.apache.lokahi.core.common.message;
 
-import lokahi.core.common.exception.UnsupportedParameterException;
+import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
 
 /**
  * @author Stephen Toback
@@ -24,8 +24,6 @@
 public interface Message {
   String send(String[] obj, boolean hasAttachement, String... params) throws UnsupportedParameterException;
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/MessageFactory.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/MessageFactory.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/MessageFactory.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/MessageFactory.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.message;
+package org.apache.lokahi.core.common.message;
 
 /**
  * @author Stephen Toback
@@ -27,8 +27,6 @@
     return new TMCSOAPMessage();
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/message/TMCSOAPMessage.java Mon Apr 17 10:36:22 2006
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.message;
+package org.apache.lokahi.core.common.message;
 
-import lokahi.core.common.exception.UnsupportedParameterException;
+import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
 import org.apache.axis.encoding.XMLType;
@@ -184,5 +184,3 @@
 //	public String sendMessage(JobTransmission jt) {}
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/DateComparator.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/DateComparator.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/DateComparator.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/DateComparator.java Mon Apr 17 10:36:22 2006
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.util;
+package org.apache.lokahi.core.common.util;
 
-import lokahi.core.common.interfaces.Datable;
+import org.apache.lokahi.core.common.interfaces.Datable;
 
 import java.util.Comparator;
 
@@ -30,8 +30,6 @@
     return ret;
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/PropertiesFile.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/PropertiesFile.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/PropertiesFile.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/PropertiesFile.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.util;
+package org.apache.lokahi.core.common.util;
 
 import org.apache.log4j.Logger;
 
@@ -123,8 +123,6 @@
   } // end getIntValue
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java Mon Apr 17 10:36:22 2006
@@ -13,29 +13,29 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.util;
+package org.apache.lokahi.core.common.util;
 
-import lokahi.core.api.environment.Environment;
-import lokahi.core.api.file.File;
-import lokahi.core.api.function.Function;
-import lokahi.core.api.instance.Instance;
-import lokahi.core.api.ipaddress.Ip;
-import lokahi.core.api.job.Job;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.pool.HostingPool;
-import lokahi.core.api.project.Project;
-import lokahi.core.api.server.Hardware;
-import lokahi.core.api.state.State;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCCollectionImpl;
-import lokahi.httpd.api.entity.VirtualHost;
-import lokahi.httpd.api.pool.ApachePool;
-import lokahi.httpd.api.server.Apache;
-import lokahi.httpd.api.worker.ApacheWorker;
-import lokahi.tomcat.api.entity.TomcatContext;
-import lokahi.tomcat.api.pool.TomcatPool;
-import lokahi.tomcat.api.server.Tomcat;
-import lokahi.tomcat.api.worker.TomcatWorker;
+import org.apache.lokahi.core.api.environment.Environment;
+import org.apache.lokahi.core.api.file.File;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.instance.Instance;
+import org.apache.lokahi.core.api.ipaddress.Ip;
+import org.apache.lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.api.project.Project;
+import org.apache.lokahi.core.api.server.Hardware;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCCollectionImpl;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.httpd.api.pool.ApachePool;
+import org.apache.lokahi.httpd.api.server.Apache;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.tomcat.api.entity.TomcatContext;
+import org.apache.lokahi.tomcat.api.pool.TomcatPool;
+import org.apache.lokahi.tomcat.api.server.Tomcat;
+import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
 import org.apache.log4j.Logger;
 
 import java.sql.SQLException;
@@ -1031,5 +1031,3 @@
   }
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java Mon Apr 17 10:36:22 2006
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.common.util;
+package org.apache.lokahi.core.common.util;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.instance.Instance;
-import lokahi.core.api.pool.HostingPool;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.httpd.api.pool.ApachePool;
-import lokahi.httpd.api.worker.ApacheWorker;
-import lokahi.tomcat.api.pool.TomcatPool;
-import lokahi.tomcat.api.worker.TomcatWorker;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.instance.Instance;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.httpd.api.pool.ApachePool;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.tomcat.api.pool.TomcatPool;
+import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
 import org.apache.log4j.Logger;
 
 import java.sql.SQLException;
@@ -93,5 +93,3 @@
   }
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java Mon Apr 17 10:36:22 2006
@@ -18,11 +18,11 @@
  * @version $Id: AdminBean.java,v 1.1 2006/03/07 19:52:00 drtobes Exp $
  */
 
-package lokahi.core.controller;
+package org.apache.lokahi.core.controller;
 
-import lokahi.core.api.instance.Instance;
-import lokahi.core.common.database.ConnBean;
-import lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.core.api.instance.Instance;
+import org.apache.lokahi.core.common.database.ConnBean;
+import org.apache.lokahi.core.common.util.PropertiesFile;
 import oracle.jdbc.driver.OracleTypes;
 import oracle.sql.ARRAY;
 import oracle.sql.STRUCT;
@@ -229,8 +229,6 @@
   } // end split
 
 } // end AdminBean
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java Mon Apr 17 10:36:22 2006
@@ -14,19 +14,19 @@
 * limitations under the License.
 */
 
-package lokahi.core.controller;
+package org.apache.lokahi.core.controller;
 /**
  * @author Stephen Toback
  * @version $Id: CheckJvmThread.java,v 1.2 2006/03/07 20:18:51 drtobes Exp $
  */
 
-import lokahi.core.api.job.Job;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.common.exception.UnsupportedParameterException;
-import lokahi.core.common.message.Message;
-import lokahi.core.common.message.MessageFactory;
-import lokahi.core.common.util.PropertiesFile;
-import lokahi.core.controller.task.SendJobTask;
+import org.apache.lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
+import org.apache.lokahi.core.common.message.Message;
+import org.apache.lokahi.core.common.message.MessageFactory;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.core.controller.task.SendJobTask;
 import org.apache.log4j.Logger;
 
 import java.io.BufferedReader;
@@ -457,8 +457,6 @@
   }
 
 } // end CheckJvmThread
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/ControllerJobFactory.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/ControllerJobFactory.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/ControllerJobFactory.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/ControllerJobFactory.java Mon Apr 17 10:36:22 2006
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.controller;
+package org.apache.lokahi.core.controller;
 
-import lokahi.core.api.job.Job;
-import lokahi.core.api.state.State;
-import lokahi.core.common.database.BrokerFactory;
-import lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/ControllerThread.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/ControllerThread.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/ControllerThread.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/ControllerThread.java Mon Apr 17 10:36:22 2006
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package lokahi.core.controller;
+package org.apache.lokahi.core.controller;
 
 import org.apache.log4j.Logger;
 
@@ -60,5 +60,3 @@
   }
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java Mon Apr 17 10:36:22 2006
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.controller.task;
+package org.apache.lokahi.core.controller.task;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.job.Job;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.httpd.api.worker.ApacheWorker;
-import lokahi.httpd.api.worker.ApacheWorkerModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel;
 import org.apache.log4j.Logger;
 
 import java.io.IOException;
@@ -76,5 +76,3 @@
     }
   }
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java Mon Apr 17 10:36:22 2006
@@ -1,7 +1,7 @@
-package lokahi.core.controller.task;
+package org.apache.lokahi.core.controller.task;
 
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.state.State;
 import org.apache.log4j.Logger;
 
 import java.sql.SQLException;
@@ -59,5 +59,3 @@
   }
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java Mon Apr 17 10:36:22 2006
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.controller.task;
+package org.apache.lokahi.core.controller.task;
 
-import lokahi.core.controller.CheckJvmThread;
+import org.apache.lokahi.core.controller.CheckJvmThread;
 import org.apache.log4j.Logger;
 
 /**
@@ -39,8 +39,6 @@
   } // end runTheThread
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java Mon Apr 17 10:36:22 2006
@@ -1,6 +1,6 @@
-package lokahi.core.controller.task;
+package org.apache.lokahi.core.controller.task;
 
-import lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.job.Job;
 import org.apache.log4j.Logger;
 
 import java.io.IOException;
@@ -56,5 +56,3 @@
     }
   }
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java Mon Apr 17 10:36:22 2006
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.help;
+package org.apache.lokahi.core.gui.help;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.gui.www.TMCAction;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.gui.www.TMCAction;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -118,8 +118,6 @@
     return hi;
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemDAO.java Mon Apr 17 10:36:22 2006
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.help;
+package org.apache.lokahi.core.gui.help;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.database.BrokerFactory;
-import lokahi.core.common.interfaces.Collectable;
-import lokahi.core.common.interfaces.Dao;
-import lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.Collectable;
+import org.apache.lokahi.core.common.interfaces.Dao;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
 import org.apache.log4j.Logger;
 import org.jdom.Element;
 
@@ -383,7 +383,5 @@
         '}';
   }
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java Mon Apr 17 10:36:22 2006
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.help;
+package org.apache.lokahi.core.gui.help;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.state.State;
-import lokahi.core.api.user.User;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.common.interfaces.LokahiModel;
-import lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.LokahiModel;
+import org.apache.lokahi.core.common.interfaces.TMCDao;
 import org.apache.log4j.Logger;
 
 import java.sql.SQLException;
@@ -84,8 +84,6 @@
     return null;  //TODO finish this.
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java Mon Apr 17 10:36:22 2006
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.help;
+package org.apache.lokahi.core.gui.help;
 
-import lokahi.core.api.user.User;
+import org.apache.lokahi.core.api.user.User;
 import org.apache.log4j.Logger;
 
 import java.util.Collection;
@@ -54,8 +54,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java Mon Apr 17 10:36:22 2006
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.alert.AlertDAO;
-import lokahi.core.api.alert.AlertModel;
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.api.alert.AlertDAO;
+import org.apache.lokahi.core.api.alert.AlertModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -112,7 +112,5 @@
   }
 
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java Mon Apr 17 10:36:22 2006
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.user.User;
-import lokahi.core.common.authentication.AuthenticationFactory;
-import lokahi.core.common.exception.AuthenticationException;
-import lokahi.core.common.interfaces.TMCConstants;
-import lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.authentication.AuthenticationFactory;
+import org.apache.lokahi.core.common.exception.AuthenticationException;
+import org.apache.lokahi.core.common.interfaces.TMCConstants;
+import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
@@ -148,7 +148,5 @@
     //   session.invalidate();
   }
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnviromentAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnviromentAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnviromentAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnviromentAction.java Mon Apr 17 10:36:22 2006
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.environment.Environment;
-import lokahi.core.api.environment.EnvironmentModel;
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.api.environment.Environment;
+import org.apache.lokahi.core.api.environment.EnvironmentModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -93,7 +93,5 @@
     return e;
   }
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.java Mon Apr 17 10:36:22 2006
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.file.File;
-import lokahi.core.api.file.FileModel;
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.api.file.File;
+import org.apache.lokahi.core.api.file.FileModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -126,8 +126,6 @@
     return f;
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HardwareAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HardwareAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HardwareAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HardwareAction.java Mon Apr 17 10:36:22 2006
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.ipaddress.Ip;
-import lokahi.core.api.server.Hardware;
-import lokahi.core.api.server.HardwareModel;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.ipaddress.Ip;
+import org.apache.lokahi.core.api.server.Hardware;
+import org.apache.lokahi.core.api.server.HardwareModel;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -168,7 +168,5 @@
     return (String) dynaForm.get(key);
   }
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java Mon Apr 17 10:36:22 2006
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.pool.HostingPool;
-import lokahi.core.api.pool.HostingPoolModel;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.api.pool.HostingPoolModel;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -126,8 +126,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/InstanceAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/InstanceAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/InstanceAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/InstanceAction.java Mon Apr 17 10:36:22 2006
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.instance.Instance;
-import lokahi.core.api.instance.InstanceModel;
-import lokahi.core.api.user.User;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.instance.Instance;
+import org.apache.lokahi.core.api.instance.InstanceModel;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -93,7 +93,5 @@
     return i;
   }
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/ProjectAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/ProjectAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/ProjectAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/ProjectAction.java Mon Apr 17 10:36:22 2006
@@ -13,18 +13,18 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.project.Project;
-import lokahi.core.api.project.ProjectModel;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.httpd.api.entity.VirtualHost;
-import lokahi.tomcat.api.entity.TomcatContext;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.project.Project;
+import org.apache.lokahi.core.api.project.ProjectModel;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.tomcat.api.entity.TomcatContext;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -142,7 +142,5 @@
   }
 
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/RestServlet.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/RestServlet.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/RestServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/RestServlet.java Mon Apr 17 10:36:22 2006
@@ -13,32 +13,32 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.environment.EnvironmentModel;
-import lokahi.core.api.file.FileModel;
-import lokahi.core.api.function.FunctionModel;
-import lokahi.core.api.instance.InstanceModel;
-import lokahi.core.api.job.JobModel;
-import lokahi.core.api.jobpool.JobPoolModel;
-import lokahi.core.api.pool.HostingPoolModel;
-import lokahi.core.api.project.ProjectModel;
-import lokahi.core.api.server.HardwareModel;
-import lokahi.core.api.state.StateModel;
-import lokahi.core.api.user.UserModel;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.interfaces.LokahiModel;
-import lokahi.core.common.interfaces.Restable;
-import lokahi.core.common.interfaces.TMCDao;
-import lokahi.core.common.util.PropertiesFile;
-import lokahi.httpd.api.entity.VirtualHostModel;
-import lokahi.httpd.api.pool.ApachePoolModel;
-import lokahi.httpd.api.server.ApacheModel;
-import lokahi.httpd.api.worker.ApacheWorkerModel;
-import lokahi.tomcat.api.entity.TomcatContextModel;
-import lokahi.tomcat.api.pool.TomcatPoolModel;
-import lokahi.tomcat.api.server.TomcatModel;
-import lokahi.tomcat.api.worker.TomcatWorkerModel;
+import org.apache.lokahi.core.api.environment.EnvironmentModel;
+import org.apache.lokahi.core.api.file.FileModel;
+import org.apache.lokahi.core.api.function.FunctionModel;
+import org.apache.lokahi.core.api.instance.InstanceModel;
+import org.apache.lokahi.core.api.job.JobModel;
+import org.apache.lokahi.core.api.jobpool.JobPoolModel;
+import org.apache.lokahi.core.api.pool.HostingPoolModel;
+import org.apache.lokahi.core.api.project.ProjectModel;
+import org.apache.lokahi.core.api.server.HardwareModel;
+import org.apache.lokahi.core.api.state.StateModel;
+import org.apache.lokahi.core.api.user.UserModel;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.interfaces.LokahiModel;
+import org.apache.lokahi.core.common.interfaces.Restable;
+import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.httpd.api.entity.VirtualHostModel;
+import org.apache.lokahi.httpd.api.pool.ApachePoolModel;
+import org.apache.lokahi.httpd.api.server.ApacheModel;
+import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel;
+import org.apache.lokahi.tomcat.api.entity.TomcatContextModel;
+import org.apache.lokahi.tomcat.api.pool.TomcatPoolModel;
+import org.apache.lokahi.tomcat.api.server.TomcatModel;
+import org.apache.lokahi.tomcat.api.worker.TomcatWorkerModel;
 import org.apache.log4j.Logger;
 import org.jdom.Element;
 
@@ -195,8 +195,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java Mon Apr 17 10:36:22 2006
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.interfaces.TMCDao;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
@@ -161,7 +161,5 @@
   }
 
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCActionServlet.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCActionServlet.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCActionServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCActionServlet.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
 import org.apache.struts.action.ActionServlet;
 
@@ -23,8 +23,6 @@
  */
 public class TMCActionServlet extends ActionServlet {
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java Mon Apr 17 10:36:22 2006
@@ -13,11 +13,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.alert.AlertDAO;
-import lokahi.core.api.alert.AlertTool;
-import lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.core.api.alert.AlertDAO;
+import org.apache.lokahi.core.api.alert.AlertTool;
+import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.log4j.Logger;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -75,8 +75,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java Mon Apr 17 10:36:22 2006
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.common.database.ConnBean;
-import lokahi.core.common.database.DerbyBroker;
-import lokahi.core.common.util.PropertiesFile;
-import lokahi.core.controller.CheckJvmThread;
+import org.apache.lokahi.core.common.database.ConnBean;
+import org.apache.lokahi.core.common.database.DerbyBroker;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.core.controller.CheckJvmThread;
 import org.apache.log4j.xml.DOMConfigurator;
 
 import javax.servlet.ServletConfig;
@@ -90,8 +90,6 @@
   } // end destroy
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCVelocityServlet.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCVelocityServlet.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCVelocityServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCVelocityServlet.java Mon Apr 17 10:36:22 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
 import org.apache.log4j.Logger;
 import org.apache.velocity.Template;
@@ -135,7 +135,5 @@
   }
 
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.java Mon Apr 17 10:36:22 2006
@@ -13,26 +13,26 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.environment.Environment;
-import lokahi.core.api.function.Function;
-import lokahi.core.api.ipaddress.Ip;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.pool.HostingPool;
-import lokahi.core.api.pool.HostingPoolModel;
-import lokahi.core.api.project.Project;
-import lokahi.core.api.state.State;
-import lokahi.core.api.user.User;
-import lokahi.core.common.authorization.AuthorizationManager;
-import lokahi.core.common.authorization.Global;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.common.interfaces.FunctionableEntity;
-import lokahi.httpd.api.entity.VirtualHost;
-import lokahi.tomcat.api.entity.TomcatContext;
+import org.apache.lokahi.core.api.environment.Environment;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.ipaddress.Ip;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.api.pool.HostingPoolModel;
+import org.apache.lokahi.core.api.project.Project;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.authorization.AuthorizationManager;
+import org.apache.lokahi.core.common.authorization.Global;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.FunctionableEntity;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.tomcat.api.entity.TomcatContext;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -371,8 +371,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/UserAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/UserAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/UserAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/UserAction.java Mon Apr 17 10:36:22 2006
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.core.gui.www;
+package org.apache.lokahi.core.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.project.Project;
-import lokahi.core.api.user.User;
-import lokahi.core.api.user.UserModel;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.project.Project;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.api.user.UserModel;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -160,6 +160,4 @@
   }
 
 }
-
-
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHost.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHost.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHost.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHost.java Mon Apr 17 10:36:22 2006
@@ -13,27 +13,27 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.entity;
+package org.apache.lokahi.httpd.api.entity;
 
-import lokahi.core.api.environment.Environment;
-import lokahi.core.api.ipaddress.Ip;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.pool.HostingPool;
-import lokahi.core.api.pool.HostingPoolModel;
-import lokahi.core.api.server.Hardware;
-import lokahi.core.api.state.State;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.database.BrokerFactory;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.common.interfaces.FunctionableEntity;
-import lokahi.core.common.interfaces.TMCBroker;
-import lokahi.core.common.interfaces.TMCDao;
-import lokahi.core.common.util.PropertiesFile;
-import lokahi.httpd.api.pool.ApachePool;
-import lokahi.httpd.api.worker.ApacheWorker;
-import lokahi.tomcat.api.entity.TomcatContext;
+import org.apache.lokahi.core.api.environment.Environment;
+import org.apache.lokahi.core.api.ipaddress.Ip;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.api.pool.HostingPoolModel;
+import org.apache.lokahi.core.api.server.Hardware;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.FunctionableEntity;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.httpd.api.pool.ApachePool;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.tomcat.api.entity.TomcatContext;
 import org.apache.log4j.Logger;
 
 import java.io.IOException;
@@ -749,8 +749,6 @@
     return vh;
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHostModel.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHostModel.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHostModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHostModel.java Mon Apr 17 10:36:22 2006
@@ -13,21 +13,21 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.entity;
+package org.apache.lokahi.httpd.api.entity;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.job.Job;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.pool.HostingPool;
-import lokahi.core.api.state.State;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.common.interfaces.LokahiModel;
-import lokahi.httpd.api.pool.ApachePool;
-import lokahi.httpd.api.worker.ApacheWorker;
-import lokahi.httpd.api.worker.ApacheWorkerModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.LokahiModel;
+import org.apache.lokahi.httpd.api.pool.ApachePool;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -138,8 +138,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java Mon Apr 17 10:36:22 2006
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.pool;
+package org.apache.lokahi.httpd.api.pool;
 
-import lokahi.core.common.database.BrokerFactory;
-import lokahi.core.common.interfaces.Cacheable;
-import lokahi.core.common.interfaces.TMCBroker;
-import lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.Cacheable;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
 import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
@@ -117,5 +117,3 @@
         '}';
   }
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java Mon Apr 17 10:36:22 2006
@@ -13,19 +13,19 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.pool;
+package org.apache.lokahi.httpd.api.pool;
 
-import lokahi.core.api.environment.Environment;
-import lokahi.core.api.instance.Instance;
-import lokahi.core.api.server.Hardware;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.database.BrokerFactory;
-import lokahi.core.common.interfaces.Pool;
-import lokahi.core.common.interfaces.TMCBroker;
-import lokahi.core.common.interfaces.TMCDao;
-import lokahi.core.common.util.PropertiesFile;
-import lokahi.httpd.api.entity.VirtualHost;
-import lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.core.api.environment.Environment;
+import org.apache.lokahi.core.api.instance.Instance;
+import org.apache.lokahi.core.api.server.Hardware;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.Pool;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
 import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
@@ -415,8 +415,6 @@
     return result;
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java Mon Apr 17 10:36:22 2006
@@ -13,19 +13,19 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.pool;
+package org.apache.lokahi.httpd.api.pool;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.project.Project;
-import lokahi.core.api.state.State;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.common.interfaces.LokahiModel;
-import lokahi.httpd.api.worker.ApacheWorker;
-import lokahi.httpd.api.worker.ApacheWorkerModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.project.Project;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.LokahiModel;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel;
 import org.apache.log4j.Logger;
 
 import java.io.IOException;
@@ -250,8 +250,6 @@
     return ApachePool.getApachePool(id);
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java Mon Apr 17 10:36:22 2006
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.server;
+package org.apache.lokahi.httpd.api.server;
 
-import lokahi.core.api.file.File;
-import lokahi.core.common.database.BrokerFactory;
-import lokahi.core.common.interfaces.Application;
-import lokahi.core.common.interfaces.TMCBroker;
-import lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.core.api.file.File;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.Application;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
@@ -380,8 +380,6 @@
     return ap;
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/ApacheModel.java Mon Apr 17 10:36:22 2006
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.server;
+package org.apache.lokahi.httpd.api.server;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.state.State;
-import lokahi.core.api.user.User;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.common.interfaces.LokahiModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.LokahiModel;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -87,8 +87,6 @@
     return this.viewApache(id);
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java Mon Apr 17 10:36:22 2006
@@ -13,18 +13,18 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.worker;
+package org.apache.lokahi.httpd.api.worker;
 
-import lokahi.core.api.instance.Instance;
-import lokahi.core.api.server.Hardware;
-import lokahi.core.api.state.State;
-import lokahi.core.common.database.BrokerFactory;
-import lokahi.core.common.interfaces.Server;
-import lokahi.core.common.interfaces.TMCBroker;
-import lokahi.core.common.interfaces.TMCDao;
-import lokahi.core.common.util.PropertiesFile;
-import lokahi.httpd.api.pool.ApachePool;
-import lokahi.httpd.api.server.Apache;
+import org.apache.lokahi.core.api.instance.Instance;
+import org.apache.lokahi.core.api.server.Hardware;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.Server;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.common.interfaces.TMCDao;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.httpd.api.pool.ApachePool;
+import org.apache.lokahi.httpd.api.server.Apache;
 import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
@@ -431,8 +431,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorkerModel.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorkerModel.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorkerModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorkerModel.java Mon Apr 17 10:36:22 2006
@@ -13,24 +13,24 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.api.worker;
+package org.apache.lokahi.httpd.api.worker;
 
-import lokahi.core.api.file.File;
-import lokahi.core.api.function.Function;
-import lokahi.core.api.ipaddress.Ip;
-import lokahi.core.api.job.Job;
-import lokahi.core.api.jobpool.JobPool;
-import lokahi.core.api.project.Project;
-import lokahi.core.api.server.Hardware;
-import lokahi.core.api.state.State;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.common.interfaces.LokahiModel;
-import lokahi.core.controller.task.BuildDeployApacheConfig;
-import lokahi.httpd.api.entity.VirtualHost;
-import lokahi.modjk.WorkersPropertiesFile;
+import org.apache.lokahi.core.api.file.File;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.ipaddress.Ip;
+import org.apache.lokahi.core.api.job.Job;
+import org.apache.lokahi.core.api.jobpool.JobPool;
+import org.apache.lokahi.core.api.project.Project;
+import org.apache.lokahi.core.api.server.Hardware;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.interfaces.LokahiModel;
+import org.apache.lokahi.core.controller.task.BuildDeployApacheConfig;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.modjk.WorkersPropertiesFile;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -357,5 +357,3 @@
     return ApacheWorker.getApacheWorker(id, false);
   }
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java Mon Apr 17 10:36:22 2006
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.gui.www;
+package org.apache.lokahi.httpd.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.common.exception.TMCIllegalArgumentException;
-import lokahi.core.gui.www.TMCAction;
-import lokahi.httpd.api.server.Apache;
-import lokahi.httpd.api.server.ApacheModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.gui.www.TMCAction;
+import org.apache.lokahi.httpd.api.server.Apache;
+import org.apache.lokahi.httpd.api.server.ApacheModel;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -129,8 +129,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java Mon Apr 17 10:36:22 2006
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.gui.www;
+package org.apache.lokahi.httpd.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.gui.www.TMCAction;
-import lokahi.httpd.api.pool.ApachePool;
-import lokahi.httpd.api.pool.ApachePoolModel;
-import lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.gui.www.TMCAction;
+import org.apache.lokahi.httpd.api.pool.ApachePool;
+import org.apache.lokahi.httpd.api.pool.ApachePoolModel;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -131,8 +131,6 @@
   }
 
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java Mon Apr 17 10:36:22 2006
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.gui.www;
+package org.apache.lokahi.httpd.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.gui.www.TMCAction;
-import lokahi.httpd.api.worker.ApacheWorker;
-import lokahi.httpd.api.worker.ApacheWorkerModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.gui.www.TMCAction;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -114,8 +114,6 @@
     return aw;
   }
 }
-
-
 
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/VirtualHostAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/VirtualHostAction.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/VirtualHostAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/VirtualHostAction.java Mon Apr 17 10:36:22 2006
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.httpd.gui.www;
+package org.apache.lokahi.httpd.gui.www;
 
-import lokahi.core.api.function.Function;
-import lokahi.core.api.user.User;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.core.common.exception.AuthorizationException;
-import lokahi.core.common.exception.TMCException;
-import lokahi.core.gui.www.TMCAction;
-import lokahi.httpd.api.entity.VirtualHost;
-import lokahi.httpd.api.entity.VirtualHostModel;
+import org.apache.lokahi.core.api.function.Function;
+import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.gui.www.TMCAction;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.httpd.api.entity.VirtualHostModel;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
@@ -119,7 +119,5 @@
   }
 
 }
-
-
 
 

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/modjk/WorkersPropertiesFile.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/modjk/WorkersPropertiesFile.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/modjk/WorkersPropertiesFile.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/modjk/WorkersPropertiesFile.java Mon Apr 17 10:36:22 2006
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.modjk;
+package org.apache.lokahi.modjk;
 
-import lokahi.core.api.instance.Instance;
-import lokahi.core.api.pool.HostingPool;
-import lokahi.core.common.collection.TMCCollectionImpl;
-import lokahi.core.common.collection.TMCSet;
-import lokahi.httpd.api.pool.ApachePool;
-import lokahi.httpd.api.worker.ApacheWorker;
-import lokahi.tomcat.api.pool.TomcatPool;
-import lokahi.tomcat.api.worker.TomcatWorker;
+import org.apache.lokahi.core.api.instance.Instance;
+import org.apache.lokahi.core.api.pool.HostingPool;
+import org.apache.lokahi.core.common.collection.TMCCollectionImpl;
+import org.apache.lokahi.core.common.collection.TMCSet;
+import org.apache.lokahi.httpd.api.pool.ApachePool;
+import org.apache.lokahi.httpd.api.worker.ApacheWorker;
+import org.apache.lokahi.tomcat.api.pool.TomcatPool;
+import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
 
 import java.sql.SQLException;
 import java.util.Collection;
@@ -171,5 +171,3 @@
   }
 
 }
-
-

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContext.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContext.java?rev=394735&r1=394734&r2=394735&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContext.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContext.java Mon Apr 17 10:36:22 2006
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package lokahi.tomcat.api.entity;
+package org.apache.lokahi.tomcat.api.entity;
 
-import lokahi.core.api.environment.Environment;
-import lokahi.core.api.state.State;
-import lokahi.core.common.database.BrokerFactory;
-import lokahi.core.common.interfaces.FunctionableEntity;
-import lokahi.core.common.interfaces.TMCBroker;
-import lokahi.core.common.util.PropertiesFile;
-import lokahi.httpd.api.entity.VirtualHost;
-import lokahi.tomcat.api.pool.TomcatPool;
-import lokahi.tomcat.api.worker.TomcatWorker;
+import org.apache.lokahi.core.api.environment.Environment;
+import org.apache.lokahi.core.api.state.State;
+import org.apache.lokahi.core.common.database.BrokerFactory;
+import org.apache.lokahi.core.common.interfaces.FunctionableEntity;
+import org.apache.lokahi.core.common.interfaces.TMCBroker;
+import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.httpd.api.entity.VirtualHost;
+import org.apache.lokahi.tomcat.api.pool.TomcatPool;
+import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
 import org.apache.log4j.Logger;
 import org.jdom.Attribute;
 import org.jdom.Document;
@@ -534,8 +534,6 @@
     return buf.toString();
   }
 }
-
-
 
 
 



Mime
View raw message