You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2009/06/27 21:02:41 UTC
svn commit: r789008 [1/2] - in /incubator/ace/trunk/gateway/src:
net/luminis/liq/bootstrap/multigateway/ net/luminis/liq/configurator/
net/luminis/liq/deployment/ net/luminis/liq/deployment/deploymentadmin/
net/luminis/liq/deployment/task/ net/luminis/...
Author: marrs
Date: Sat Jun 27 19:02:38 2009
New Revision: 789008
URL: http://svn.apache.org/viewvc?rev=789008&view=rev
Log:
Renamed packages to basename "org.apache.ace" and added license headers to each source file.
Added:
incubator/ace/trunk/gateway/src/org/
incubator/ace/trunk/gateway/src/org/apache/
incubator/ace/trunk/gateway/src/org/apache/ace/
incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/
incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/bootstrap/multigateway/
incubator/ace/trunk/gateway/src/org/apache/ace/configurator/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/configurator/
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/Deployment.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/Deployment.java
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/deploymentadmin/
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/task/
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/Activator.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/PropertyBasedDiscovery.java
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/constants/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/constants/
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/upnp/
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/Activator.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/LogImpl.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/LogImpl.java
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/LogStore.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/store/LogStore.java
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/store/impl/
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/task/
incubator/ace/trunk/gateway/src/org/apache/ace/identification/
incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/identification/ifconfig/
incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/
incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/Activator.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/PropertyBasedIdentification.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/PropertyBasedIdentification.java
incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/constants/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/constants/
incubator/ace/trunk/gateway/src/org/apache/ace/log/
incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/log/listener/
incubator/ace/trunk/gateway/src/org/apache/ace/ma/
incubator/ace/trunk/gateway/src/org/apache/ace/ma/Activator.java
- copied, changed from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/ma/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/ma/webstart/
incubator/ace/trunk/gateway/src/org/apache/ace/scheduler/
- copied from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/scheduler/
Removed:
incubator/ace/trunk/gateway/src/net/luminis/liq/bootstrap/multigateway/
incubator/ace/trunk/gateway/src/net/luminis/liq/configurator/
incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/Deployment.java
incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/deploymentadmin/
incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/task/
incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/Activator.java
incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/PropertyBasedDiscovery.java
incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/constants/
incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/upnp/
incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/Activator.java
incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/LogImpl.java
incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/store/LogStore.java
incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/store/impl/
incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/task/
incubator/ace/trunk/gateway/src/net/luminis/liq/identification/ifconfig/
incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/Activator.java
incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/PropertyBasedIdentification.java
incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/constants/
incubator/ace/trunk/gateway/src/net/luminis/liq/log/listener/
incubator/ace/trunk/gateway/src/net/luminis/liq/ma/Activator.java
incubator/ace/trunk/gateway/src/net/luminis/liq/ma/webstart/
incubator/ace/trunk/gateway/src/net/luminis/liq/scheduler/
incubator/ace/trunk/gateway/src/net/luminis/sample/managedservice/
incubator/ace/trunk/gateway/src/net/luminis/sample/managedservicefactory/
Modified:
incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/FrameworkStarter.java
incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/MultiFrameworkStarter.java
incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Configurator.java
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentCheckTask.java
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentTaskBase.java
incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentUpdateTask.java
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/constants/DiscoveryConstants.java
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/Connection.java
incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/LogSyncTask.java
incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/IfconfigIdentification.java
incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/constants/IdentificationConstants.java
incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/ListenerImpl.java
incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogCache.java
incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogProxy.java
incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogTracker.java
incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Override.java
incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/SystemPropertyDiscovery.java
incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/SystemPropertyIdentification.java
incubator/ace/trunk/gateway/src/org/apache/ace/scheduler/Activator.java
incubator/ace/trunk/gateway/src/org/apache/ace/scheduler/Executer.java
incubator/ace/trunk/gateway/src/org/apache/ace/scheduler/Scheduler.java
incubator/ace/trunk/gateway/src/org/apache/ace/scheduler/SchedulerTask.java
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/FrameworkStarter.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/FrameworkStarter.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/FrameworkStarter.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/FrameworkStarter.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.bootstrap.multigateway;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.bootstrap.multigateway;
import java.io.File;
import java.io.FilenameFilter;
@@ -13,7 +31,7 @@
public class FrameworkStarter {
private static final String KEYVALUE_SPLITTER = "=";
- private static final String RUNTIME_PROPERTY = "net.luminis.atlas.gateway.bootstrap.runtime";
+ private static final String RUNTIME_PROPERTY = "org.apache.ace.bootstrap.runtime";
/** The list of bundles that will be installed and started during framework start up. */
protected List m_bundlePaths = new ArrayList();
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/MultiFrameworkStarter.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/MultiFrameworkStarter.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/MultiFrameworkStarter.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/bootstrap/multigateway/MultiFrameworkStarter.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.bootstrap.multigateway;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.bootstrap.multigateway;
import java.io.File;
import java.io.FileNotFoundException;
@@ -28,7 +46,7 @@
*/
public static final String COMMENT_START = "#";
- private static final String RUNTIME_PROPERTY = "net.luminis.atlas.gateway.bootstrap.runtime";
+ private static final String RUNTIME_PROPERTY = "org.apache.ace.bootstrap.runtime";
/**
* The system property name used to specify an URL to the configuration property file to be used for the created the
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Activator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.configurator;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.configurator;
import java.io.File;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Configurator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Configurator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Configurator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/configurator/Configurator.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.configurator;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.configurator;
import java.io.File;
import java.io.FileFilter;
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/deployment/Deployment.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/Deployment.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/deployment/Deployment.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/deployment/Deployment.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/Deployment.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/deployment/Deployment.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/deployment/Deployment.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.deployment;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment;
import java.io.InputStream;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,7 +1,24 @@
-package net.luminis.liq.deployment.deploymentadmin;
-
-import net.luminis.liq.deployment.Deployment;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.deploymentadmin;
+import org.apache.ace.deployment.Deployment;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/deployment/deploymentadmin/DeploymentAdminDeployer.java Sat Jun 27 19:02:38 2009
@@ -1,9 +1,26 @@
-package net.luminis.liq.deployment.deploymentadmin;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.deploymentadmin;
import java.io.InputStream;
-import net.luminis.liq.deployment.Deployment;
-
+import org.apache.ace.deployment.Deployment;
import org.osgi.framework.Version;
import org.osgi.service.deploymentadmin.DeploymentAdmin;
import org.osgi.service.deploymentadmin.DeploymentPackage;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/Activator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,13 +1,30 @@
-package net.luminis.liq.deployment.task;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.task;
import java.util.Dictionary;
import java.util.Properties;
-import net.luminis.liq.deployment.Deployment;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.scheduler.constants.SchedulerConstants;
-
+import org.apache.ace.deployment.Deployment;
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.scheduler.constants.SchedulerConstants;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentCheckTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentCheckTask.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentCheckTask.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentCheckTask.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.deployment.task;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.task;
import java.net.MalformedURLException;
import java.net.URL;
@@ -13,7 +31,7 @@
* download or install it.
*/
public class DeploymentCheckTask extends DeploymentTaskBase implements Runnable {
- private static final String TOPIC_UPDATE_AVAILABLE = "net/luminis/liq/deployment/UPDATEAVAILABLE";
+ private static final String TOPIC_UPDATE_AVAILABLE = "org/apache/ace/deployment/UPDATEAVAILABLE";
/**
* When run a check is made if a higher version is available on the remote. If so, send out an event.
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentTaskBase.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentTaskBase.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentTaskBase.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentTaskBase.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.deployment.task;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.task;
import java.io.BufferedReader;
import java.io.IOException;
@@ -11,10 +29,9 @@
import java.util.List;
import java.util.Properties;
-import net.luminis.liq.deployment.Deployment;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.identification.Identification;
-
+import org.apache.ace.deployment.Deployment;
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.identification.Identification;
import org.osgi.framework.Version;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -22,7 +39,7 @@
public class DeploymentTaskBase {
- private final String TOPIC_DEPLOYMENTPACKAGE_INSTALL = "net/luminis/liq/deployment/INSTALL";
+ private final String TOPIC_DEPLOYMENTPACKAGE_INSTALL = "org/apache/ace/deployment/INSTALL";
// injected by dependencymanager
protected volatile Deployment m_deployer;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentUpdateTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentUpdateTask.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentUpdateTask.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/deployment/task/DeploymentUpdateTask.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.deployment.task;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.deployment.task;
import java.io.IOException;
import java.net.MalformedURLException;
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/Activator.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/Activator.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/Activator.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/Activator.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/Activator.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,11 +1,28 @@
-package net.luminis.liq.discovery.property;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery.property;
import java.util.Dictionary;
import java.util.Hashtable;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.discovery.property.constants.DiscoveryConstants;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.discovery.property.constants.DiscoveryConstants;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
@@ -30,5 +47,4 @@
public void destroy(BundleContext context, DependencyManager manager) throws Exception {
// do nothing
}
-
}
\ No newline at end of file
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/PropertyBasedDiscovery.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/PropertyBasedDiscovery.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/discovery/property/PropertyBasedDiscovery.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java Sat Jun 27 19:02:38 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.discovery.property;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery.property;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Dictionary;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.discovery.property.constants.DiscoveryConstants;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.discovery.property.constants.DiscoveryConstants;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
@@ -20,7 +37,7 @@
*/
public class PropertyBasedDiscovery implements Discovery, ManagedService {
- volatile public LogService m_log; /* will be injected by dependencymanager */
+ public volatile LogService m_log; /* will be injected by dependencymanager */
private URL m_serverURL; /* managed by configadmin */
public synchronized void updated(Dictionary dictionary) throws ConfigurationException {
@@ -37,5 +54,4 @@
public synchronized URL discover() {
return m_serverURL;
}
-
}
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/constants/DiscoveryConstants.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/constants/DiscoveryConstants.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/constants/DiscoveryConstants.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/discovery/property/constants/DiscoveryConstants.java Sat Jun 27 19:02:38 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.discovery.property.constants;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery.property.constants;
public interface DiscoveryConstants {
- public static final String DISCOVERY_PID = "net.luminis.liq.discovery.property";
+ public static final String DISCOVERY_PID = "org.apache.ace.discovery.property";
public static final String DISCOVERY_URL_KEY = "serverURL";
}
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/Activator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,7 +1,24 @@
-package net.luminis.liq.discovery.upnp;
-
-import net.luminis.liq.discovery.Discovery;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery.upnp;
+import org.apache.ace.discovery.Discovery;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
@@ -11,8 +28,6 @@
public class Activator extends DependencyActivatorBase {
public void init(BundleContext context, DependencyManager manager) throws Exception {
-
-
StringBuffer deviceFilter = new StringBuffer();
deviceFilter.append("(")
.append(UPnPDevice.TYPE).append("=")
@@ -35,5 +50,4 @@
public void destroy(BundleContext context, DependencyManager manager) throws Exception {
// do nothing
}
-
}
\ No newline at end of file
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/discovery/upnp/UPnPBasedDiscovery.java Sat Jun 27 19:02:38 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.discovery.upnp;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery.upnp;
import java.net.URL;
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.List;
-import net.luminis.liq.discovery.Discovery;
-
+import org.apache.ace.discovery.Discovery;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;
import org.osgi.service.upnp.UPnPAction;
@@ -15,18 +32,16 @@
/**
* Simple implementation of the <code>Discovery</code> interface. It 'discovers'
- * the Provisioning Server by means of UPnP.
+ * the server by means of UPnP.
*/
public class UPnPBasedDiscovery implements Discovery {
-
final static String DEVICE_TYPE = "urn:schemas-upnp-org:device:ProvisioningDevice:1";
final static String SERVICE_ID = "urn:upnp-org:serviceId:LocationService:1";
final static String ACTION_GET_LOCATION = "GetLocation";
final static String ACTION_GET_TYPE = "GetServerType";
final static String ACTION_GET_LOAD = "GetServerLoad";
- volatile public LogService m_log; /* will be injected by dependencymanager */
-
+ public volatile LogService m_log; /* will be injected by dependencymanager */
private List m_devices;
public void start() {
@@ -39,15 +54,11 @@
}
}
-
public void removed(Object device) {
m_devices.remove(device);
}
-
-
public synchronized URL discover() {
-
try {
return getLocation();
}
@@ -58,7 +69,6 @@
return null;
}
-
private URL getLocation() {
UPnPAction action = getAction(ACTION_GET_LOCATION);
try {
@@ -109,5 +119,4 @@
}
return null;
}
-
}
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/Activator.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/Activator.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/Activator.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/Activator.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/Activator.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,17 +1,34 @@
-package net.luminis.liq.gateway.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.gateway.log.task.LogSyncTask;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.log.Log;
-import net.luminis.liq.scheduler.constants.SchedulerConstants;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.gateway.log.task.LogSyncTask;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.log.Log;
+import org.apache.ace.scheduler.constants.SchedulerConstants;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.apache.felix.dependencymanager.Service;
@@ -33,7 +50,7 @@
public void init(BundleContext context, DependencyManager manager) throws Exception {
m_manager = manager;
Properties props = new Properties();
- props.put(Constants.SERVICE_PID, "net.luminis.liq.gateway.log.factory");
+ props.put(Constants.SERVICE_PID, "org.apache.ace.gateway.log.factory");
manager.add(createService()
.setInterface(ManagedServiceFactory.class.getName(), props)
.setImplementation(this)
@@ -92,9 +109,9 @@
m_syncInstances.put(pid, sync);
m_manager.add(log);
m_manager.add(sync);
- } else {
+ }
+ else {
m_log.log(LogService.LOG_INFO, "Ignoring configuration update because factory instance was lready configured: " + name);
}
}
-
}
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/LogImpl.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/LogImpl.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/LogImpl.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/LogImpl.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/LogImpl.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/LogImpl.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/LogImpl.java Sat Jun 27 19:02:38 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.gateway.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log;
import java.io.IOException;
import java.util.Dictionary;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.log.Log;
-
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.log.Log;
+import org.apache.ace.log.LogEvent;
import org.osgi.service.log.LogService;
public class LogImpl implements Log {
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/LogStore.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/store/LogStore.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/LogStore.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/LogStore.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/store/LogStore.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/gateway/log/store/LogStore.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/LogStore.java Sat Jun 27 19:02:38 2009
@@ -1,10 +1,28 @@
-package net.luminis.liq.gateway.log.store;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log.store;
import java.io.IOException;
import java.util.Dictionary;
import java.util.List;
-import net.luminis.liq.log.LogEvent;
+import org.apache.ace.log.LogEvent;
/**
* Server log store interface for the gateways. Implementations of this service interface provide a persisted storage for
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.gateway.log.store.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log.store.impl;
import java.io.File;
import java.util.Dictionary;
@@ -6,9 +24,8 @@
import java.util.Map;
import java.util.Properties;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.identification.Identification;
-
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.identification.Identification;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.apache.felix.dependencymanager.Service;
@@ -31,7 +48,7 @@
m_context = context;
m_manager = manager;
Properties props = new Properties();
- props.put(Constants.SERVICE_PID, "net.luminis.liq.gateway.log.store.factory");
+ props.put(Constants.SERVICE_PID, "org.apache.ace.gateway.log.store.factory");
manager.add(createService()
.setInterface(ManagedServiceFactory.class.getName(), props)
.setImplementation(this)
@@ -86,6 +103,4 @@
m_log.log(LogService.LOG_INFO, "Ignoring configuration update because factory instance was already configured: " + name);
}
}
-
-
}
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/store/impl/LogStoreImpl.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.gateway.log.store.impl;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log.store.impl;
import java.io.EOFException;
import java.io.File;
@@ -8,10 +26,9 @@
import java.util.Dictionary;
import java.util.List;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.log.LogEvent;
-
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.log.LogEvent;
import org.osgi.service.log.LogService;
/**
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/Connection.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/Connection.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/Connection.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/Connection.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.gateway.log.task;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log.task;
import java.io.IOException;
import java.io.InputStream;
@@ -8,7 +26,6 @@
/**
* Helper class that abstracts handling of a URLConnection somewhat.
- *
*/
public class Connection {
private URLConnection m_connection;
@@ -70,5 +87,4 @@
}
}
}
-
}
\ No newline at end of file
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/LogSyncTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/LogSyncTask.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/LogSyncTask.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/gateway/log/task/LogSyncTask.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.gateway.log.task;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.gateway.log.task;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -9,14 +27,13 @@
import java.net.URL;
import java.util.List;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.repository.RangeIterator;
-import net.luminis.liq.repository.SortedRangeSet;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.repository.RangeIterator;
+import org.apache.ace.repository.SortedRangeSet;
import org.osgi.service.log.LogService;
public class LogSyncTask implements Runnable {
@@ -136,5 +153,4 @@
}
}
}
-
}
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/Activator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,7 +1,24 @@
-package net.luminis.liq.identification.ifconfig;
-
-import net.luminis.liq.identification.Identification;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification.ifconfig;
+import org.apache.ace.identification.Identification;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/IfconfigIdentification.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/IfconfigIdentification.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/IfconfigIdentification.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/identification/ifconfig/IfconfigIdentification.java Sat Jun 27 19:02:38 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.identification.ifconfig;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification.ifconfig;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import net.luminis.liq.identification.Identification;
-
+import org.apache.ace.identification.Identification;
import org.osgi.service.log.LogService;
/**
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/Activator.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/Activator.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/Activator.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/Activator.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/Activator.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,8 +1,25 @@
-package net.luminis.liq.identification.property;
-
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.identification.property.constants.IdentificationConstants;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification.property;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.identification.property.constants.IdentificationConstants;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleContext;
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/PropertyBasedIdentification.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/PropertyBasedIdentification.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/PropertyBasedIdentification.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/PropertyBasedIdentification.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/PropertyBasedIdentification.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/identification/property/PropertyBasedIdentification.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/PropertyBasedIdentification.java Sat Jun 27 19:02:38 2009
@@ -1,10 +1,27 @@
-package net.luminis.liq.identification.property;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification.property;
import java.util.Dictionary;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.identification.property.constants.IdentificationConstants;
-
+import org.apache.ace.identification.Identification;
+import org.apache.ace.identification.property.constants.IdentificationConstants;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.log.LogService;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/constants/IdentificationConstants.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/constants/IdentificationConstants.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/constants/IdentificationConstants.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/identification/property/constants/IdentificationConstants.java Sat Jun 27 19:02:38 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.identification.property.constants;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification.property.constants;
public interface IdentificationConstants {
- public static final String IDENTIFICATION_PID = "net.luminis.liq.identification.property";
+ public static final String IDENTIFICATION_PID = "org.apache.ace.identification.property";
public static final String IDENTIFICATION_GATEWAYID_KEY = "gatewayID";
}
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/Activator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,10 +1,27 @@
-package net.luminis.liq.log.listener;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.listener;
import java.util.Dictionary;
import java.util.Hashtable;
-import net.luminis.liq.log.Log;
-
+import org.apache.ace.log.Log;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -28,7 +45,7 @@
private static final String LOG_NAME = "auditlog";
- private final static String [] topics = new String[] { "org/osgi/service/deployment/*", "net/luminis/liq/deployment/*" };
+ private final static String [] topics = new String[] { "org/osgi/service/deployment/*", "org/apache/ace/deployment/*" };
private ServiceTracker m_logTracker;
private ListenerImpl m_listener;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/ListenerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/ListenerImpl.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/ListenerImpl.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/ListenerImpl.java Sat Jun 27 19:02:38 2009
@@ -1,13 +1,30 @@
-package net.luminis.liq.log.listener;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.listener;
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.List;
import java.util.Properties;
-import net.luminis.liq.log.AuditEvent;
-import net.luminis.liq.log.Log;
-
+import org.apache.ace.log.AuditEvent;
+import org.apache.ace.log.Log;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -33,7 +50,7 @@
private final String TOPIC_UNINSTALL = "org/osgi/service/deployment/UNINSTALL";
private final String TOPIC_COMPLETE = "org/osgi/service/deployment/COMPLETE";
- private final String TOPIC_DEPLOYMENTPACKAGE_INSTALL = "net/luminis/liq/deployment/INSTALL";
+ private final String TOPIC_DEPLOYMENTPACKAGE_INSTALL = "org/apache/ace/deployment/INSTALL";
volatile BundleContext m_context;
volatile Log m_auditLog;
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogCache.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogCache.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogCache.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogCache.java Sat Jun 27 19:02:38 2009
@@ -1,11 +1,29 @@
-package net.luminis.liq.log.listener;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.listener;
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Iterator;
import java.util.List;
-import net.luminis.liq.log.Log;
+import org.apache.ace.log.Log;
/**
* This cache is used whenever the real log service is not available. When
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogProxy.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogProxy.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogProxy.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogProxy.java Sat Jun 27 19:02:38 2009
@@ -1,8 +1,26 @@
-package net.luminis.liq.log.listener;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.listener;
import java.util.Dictionary;
-import net.luminis.liq.log.Log;
+import org.apache.ace.log.Log;
/**
* Class responsible for being the object to talk to when trying to log events. This class
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogTracker.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogTracker.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogTracker.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/log/listener/LogTracker.java Sat Jun 27 19:02:38 2009
@@ -1,7 +1,24 @@
-package net.luminis.liq.log.listener;
-
-import net.luminis.liq.log.Log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log.listener;
+import org.apache.ace.log.Log;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
@@ -50,4 +67,3 @@
// do nothing
}
}
-
Copied: incubator/ace/trunk/gateway/src/org/apache/ace/ma/Activator.java (from r788992, incubator/ace/trunk/gateway/src/net/luminis/liq/ma/Activator.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/ma/Activator.java?p2=incubator/ace/trunk/gateway/src/org/apache/ace/ma/Activator.java&p1=incubator/ace/trunk/gateway/src/net/luminis/liq/ma/Activator.java&r1=788992&r2=789008&rev=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/net/luminis/liq/ma/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/ma/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,30 +1,48 @@
-package net.luminis.liq.ma;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.ma;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
// TODO work in progress
public class Activator implements BundleActivator {
- private net.luminis.liq.identification.property.Activator m_identification;
- private net.luminis.liq.discovery.property.Activator m_discovery;
- private net.luminis.liq.deployment.deploymentadmin.Activator m_deployment;
- private net.luminis.liq.deployment.task.Activator m_task;
- private net.luminis.liq.scheduler.Activator m_scheduler;
- private net.luminis.liq.configurator.Activator m_configurator;
- private net.luminis.liq.gateway.log.store.impl.Activator m_store;
- private net.luminis.liq.gateway.log.Activator m_log;
- private net.luminis.liq.log.listener.Activator m_logListener;
+ private org.apache.ace.identification.property.Activator m_identification;
+ private org.apache.ace.discovery.property.Activator m_discovery;
+ private org.apache.ace.deployment.deploymentadmin.Activator m_deployment;
+ private org.apache.ace.deployment.task.Activator m_task;
+ private org.apache.ace.scheduler.Activator m_scheduler;
+ private org.apache.ace.configurator.Activator m_configurator;
+ private org.apache.ace.gateway.log.store.impl.Activator m_store;
+ private org.apache.ace.gateway.log.Activator m_log;
+ private org.apache.ace.log.listener.Activator m_logListener;
public void start(BundleContext context) throws Exception {
- m_identification = new net.luminis.liq.identification.property.Activator();
- m_discovery = new net.luminis.liq.discovery.property.Activator();
- m_deployment = new net.luminis.liq.deployment.deploymentadmin.Activator();
- m_task = new net.luminis.liq.deployment.task.Activator();
- m_scheduler = new net.luminis.liq.scheduler.Activator();
- m_configurator = new net.luminis.liq.configurator.Activator();
- m_store = new net.luminis.liq.gateway.log.store.impl.Activator();
- m_log = new net.luminis.liq.gateway.log.Activator();
- m_logListener = new net.luminis.liq.log.listener.Activator();
+ m_identification = new org.apache.ace.identification.property.Activator();
+ m_discovery = new org.apache.ace.discovery.property.Activator();
+ m_deployment = new org.apache.ace.deployment.deploymentadmin.Activator();
+ m_task = new org.apache.ace.deployment.task.Activator();
+ m_scheduler = new org.apache.ace.scheduler.Activator();
+ m_configurator = new org.apache.ace.configurator.Activator();
+ m_store = new org.apache.ace.gateway.log.store.impl.Activator();
+ m_log = new org.apache.ace.gateway.log.Activator();
+ m_logListener = new org.apache.ace.log.listener.Activator();
m_identification.start(context);
m_discovery.start(context);
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Activator.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Activator.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Activator.java Sat Jun 27 19:02:38 2009
@@ -1,18 +1,35 @@
-package net.luminis.liq.ma.webstart;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.ma.webstart;
import java.io.File;
import java.util.Dictionary;
import java.util.Properties;
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.gateway.log.LogImpl;
-import net.luminis.liq.gateway.log.store.LogStore;
-import net.luminis.liq.gateway.log.store.impl.LogStoreImpl;
-import net.luminis.liq.gateway.log.task.LogSyncTask;
-import net.luminis.liq.identification.Identification;
-import net.luminis.liq.log.Log;
-import net.luminis.liq.scheduler.constants.SchedulerConstants;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.gateway.log.LogImpl;
+import org.apache.ace.gateway.log.store.LogStore;
+import org.apache.ace.gateway.log.store.impl.LogStoreImpl;
+import org.apache.ace.gateway.log.task.LogSyncTask;
+import org.apache.ace.identification.Identification;
+import org.apache.ace.log.Log;
+import org.apache.ace.scheduler.constants.SchedulerConstants;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
import org.osgi.framework.BundleActivator;
@@ -38,21 +55,21 @@
public void start(BundleContext context) throws Exception {
// start the log listener first so it can listen to as many events as possible
- m_logListener = new net.luminis.liq.log.listener.Activator();
+ m_logListener = new org.apache.ace.log.listener.Activator();
m_logListener.start(context);
// invoke standard superclass behaviour, which will eventually call our init() method
super.start(context);
- m_deployment = new net.luminis.liq.deployment.deploymentadmin.Activator();
+ m_deployment = new org.apache.ace.deployment.deploymentadmin.Activator();
m_deployment.start(context);
- m_task = new net.luminis.liq.deployment.task.Activator();
+ m_task = new org.apache.ace.deployment.task.Activator();
m_task.start(context);
m_eventAdmin = (BundleActivator) Class.forName("org.apache.felix.eventadmin.impl.Activator").newInstance();
m_eventAdmin.start(context);
m_deploymentAdmin = (BundleActivator) Class.forName("org.apache.felix.deploymentadmin.Activator").newInstance();
m_deploymentAdmin.start(context);
- m_scheduler = new net.luminis.liq.scheduler.Activator();
+ m_scheduler = new org.apache.ace.scheduler.Activator();
m_scheduler.start(context);
}
Modified: incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Override.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Override.java?rev=789008&r1=788992&r2=789008&view=diff
==============================================================================
--- incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Override.java (original)
+++ incubator/ace/trunk/gateway/src/org/apache/ace/ma/webstart/Override.java Sat Jun 27 19:02:38 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.ma.webstart;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.ma.webstart;
import java.io.File;
import java.io.FileInputStream;