Return-Path: Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Received: (qmail 5656 invoked from network); 27 Jun 2009 20:22:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Jun 2009 20:22:03 -0000 Received: (qmail 78106 invoked by uid 500); 27 Jun 2009 20:22:13 -0000 Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org Received: (qmail 78082 invoked by uid 500); 27 Jun 2009 20:22:13 -0000 Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ace-dev@incubator.apache.org Delivered-To: mailing list ace-commits@incubator.apache.org Received: (qmail 78072 invoked by uid 99); 27 Jun 2009 20:22:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Jun 2009 20:22:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Jun 2009 20:22:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 802762388909; Sat, 27 Jun 2009 20:21:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r789011 [4/5] - in /incubator/ace/trunk/server/src: net/luminis/liq/activation/info/codec/ net/luminis/liq/activation/info/factory/ net/luminis/liq/activation/matcher/ net/luminis/liq/activation/service/ net/luminis/liq/application/info/ ne... Date: Sat, 27 Jun 2009 20:21:36 -0000 To: ace-commits@incubator.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090627202142.802762388909@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/deployment/streamgenerator/StreamGenerator.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java?p2=incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/deployment/streamgenerator/StreamGenerator.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/deployment/streamgenerator/StreamGenerator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.deployment.streamgenerator; +/* + * 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.streamgenerator; import java.io.IOException; import java.io.InputStream; Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/impl/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,14 +1,30 @@ -package net.luminis.liq.deployment.streamgenerator.impl; - -import net.luminis.liq.deployment.provider.DeploymentProvider; -import net.luminis.liq.deployment.streamgenerator.StreamGenerator; +/* + * 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.streamgenerator.impl; +import org.apache.ace.deployment.provider.DeploymentProvider; +import org.apache.ace.deployment.streamgenerator.StreamGenerator; import org.apache.felix.dependencymanager.DependencyActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext; public class Activator extends DependencyActivatorBase { - @Override public void init(BundleContext context, DependencyManager manager) throws Exception { manager.add(createService() Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/impl/StreamGeneratorImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/impl/StreamGeneratorImpl.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/impl/StreamGeneratorImpl.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/deployment/streamgenerator/impl/StreamGeneratorImpl.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.deployment.streamgenerator.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.deployment.streamgenerator.impl; import java.io.IOException; import java.io.InputStream; @@ -11,9 +29,9 @@ import java.util.jar.Manifest; import java.util.zip.ZipEntry; -import net.luminis.liq.deployment.provider.ArtifactData; -import net.luminis.liq.deployment.provider.DeploymentProvider; -import net.luminis.liq.deployment.streamgenerator.StreamGenerator; +import org.apache.ace.deployment.provider.ArtifactData; +import org.apache.ace.deployment.provider.DeploymentProvider; +import org.apache.ace.deployment.streamgenerator.StreamGenerator; /** * Stream generator for deployment packages. Communicates with a data provider to get the meta data for the streams. Part of the Copied: incubator/ace/trunk/server/src/org/apache/ace/http/listener/Activator.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/http/listener/Activator.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/http/listener/Activator.java?p2=incubator/ace/trunk/server/src/org/apache/ace/http/listener/Activator.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/http/listener/Activator.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/http/listener/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/http/listener/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.http.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.http.listener; import java.util.HashMap; import java.util.HashSet; @@ -8,8 +26,7 @@ import javax.servlet.Servlet; import javax.servlet.http.HttpServlet; -import net.luminis.liq.http.listener.constants.HttpConstants; - +import org.apache.ace.http.listener.constants.HttpConstants; import org.apache.felix.dependencymanager.DependencyActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext; Modified: incubator/ace/trunk/server/src/org/apache/ace/http/listener/constants/HttpConstants.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/http/listener/constants/HttpConstants.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/http/listener/constants/HttpConstants.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/http/listener/constants/HttpConstants.java Sat Jun 27 20:21:28 2009 @@ -1,8 +1,26 @@ -package net.luminis.liq.http.listener.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.http.listener.constants; public interface HttpConstants { /** * Endpoint constant to be used by several Servlet bundles. */ - public static final String ENDPOINT = "net.luminis.liq.server.servlet.endpoint"; + public static final String ENDPOINT = "org.apache.ace.server.servlet.endpoint"; } Copied: incubator/ace/trunk/server/src/org/apache/ace/location/LocationService.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/location/LocationService.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/LocationService.java?p2=incubator/ace/trunk/server/src/org/apache/ace/location/LocationService.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/location/LocationService.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/location/LocationService.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/LocationService.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.location; +/* + * 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.location; import java.net.URL; Copied: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/Activator.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/Activator.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/Activator.java?p2=incubator/ace/trunk/server/src/org/apache/ace/location/upnp/Activator.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/Activator.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,8 +1,25 @@ -package net.luminis.liq.location.upnp; - -import net.luminis.liq.location.LocationService; -import net.luminis.liq.location.upnp.util.HostUtil; +/* + * 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.location.upnp; +import org.apache.ace.location.LocationService; +import org.apache.ace.location.upnp.util.HostUtil; import org.apache.felix.dependencymanager.DependencyActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext; @@ -10,8 +27,6 @@ import org.osgi.service.upnp.UPnPDevice; public class Activator extends DependencyActivatorBase { - - @Override public void init(BundleContext context, DependencyManager manager) throws Exception { @@ -21,8 +36,6 @@ ProvisioningDevice psDevice = new ProvisioningDevice(host, port); - - //this service is configured with the correct settings manager.add(createService() .setImplementation(new LocationServiceImpl(host, port)) Copied: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/LocationServiceImpl.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/LocationServiceImpl.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/LocationServiceImpl.java?p2=incubator/ace/trunk/server/src/org/apache/ace/location/upnp/LocationServiceImpl.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/LocationServiceImpl.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/LocationServiceImpl.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/LocationServiceImpl.java Sat Jun 27 20:21:28 2009 @@ -1,41 +1,42 @@ -package net.luminis.liq.location.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.location.upnp; import java.net.URL; import java.util.Dictionary; -import net.luminis.liq.location.LocationService; - +import org.apache.ace.location.LocationService; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; /** - * - * the actual implementation for the Location Service. - * - * - * @author dennisg - * + * The actual implementation for the Location Service. */ public class LocationServiceImpl implements LocationService, ManagedService { - - - - - - public final static String PID = "net.luminis.liq.location.upnp.LocationService"; + public final static String PID = "org.apache.ace.location.upnp.LocationService"; private final static String ENDPOINT_URL = "endpoint.url"; private final static String ENDPOINT_TYPE = "endpoint.type"; - - private final String m_host; - private final int m_port; - private URL m_location; - private String m_serverType; - public LocationServiceImpl(String host, int port) { m_host = host; m_port = port; @@ -52,12 +53,9 @@ return (String)val; } throw new ConfigurationException(key, "invalid format (not a String)"); - } - public synchronized void updated(Dictionary dict) throws ConfigurationException { - if (dict == null) { return; } @@ -95,7 +93,6 @@ } public int getServerLoad() { - return (int)(40 + Math.random()*10); + return (int) (40 + Math.random()*10); } - } \ No newline at end of file Copied: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/ProvisioningDevice.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/ProvisioningDevice.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/ProvisioningDevice.java?p2=incubator/ace/trunk/server/src/org/apache/ace/location/upnp/ProvisioningDevice.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/ProvisioningDevice.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/ProvisioningDevice.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/ProvisioningDevice.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.location.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.location.upnp; import java.io.IOException; import java.io.PrintWriter; @@ -17,17 +35,12 @@ import org.osgi.service.upnp.UPnPIcon; import org.osgi.service.upnp.UPnPService; +// TODO refactor this to use the servlet whiteboard pattern public class ProvisioningDevice extends HttpServlet implements UPnPDevice { - - final private String DEVICE_ID = "uuid:" + UUID.randomUUID(); - - final static String BASE_URL = "/upnp/provisioningdevice"; - + private final String DEVICE_ID = "uuid:" + UUID.randomUUID(); + static final String BASE_URL = "/upnp/provisioningdevice"; private Properties m_properties; - - //managed - private HttpService m_http; - + private volatile HttpService m_http; private final String m_host; private final int m_port; @@ -49,7 +62,6 @@ m_http.registerServlet(BASE_URL, this, null, null); } - private void stop() { m_http.unregister(BASE_URL); } @@ -59,7 +71,6 @@ m_properties = new Properties(); m_properties.put(UPnPDevice.UPNP_EXPORT,""); - //this is odd, we have to have this // property here, otherwise the device will not be exported //although the docs say otherwise @@ -69,12 +80,12 @@ ); m_properties.put(UPnPDevice.FRIENDLY_NAME,"UPnP Provisioning Device"); - m_properties.put(UPnPDevice.MANUFACTURER,"luminis iQ Products"); - m_properties.put(UPnPDevice.MANUFACTURER_URL,"http://www.luminiq.nl"); - m_properties.put(UPnPDevice.MODEL_DESCRIPTION,"A Provisioning Device that is automagically locatable by gateways"); - m_properties.put(UPnPDevice.MODEL_NAME,"DennisG"); + m_properties.put(UPnPDevice.MANUFACTURER,"Apache ACE"); + m_properties.put(UPnPDevice.MANUFACTURER_URL,"http://incubator.apache.org/ace/"); + m_properties.put(UPnPDevice.MODEL_DESCRIPTION,"A device that is automagically locatable by targets."); + m_properties.put(UPnPDevice.MODEL_NAME,"Apache ACE Device"); m_properties.put(UPnPDevice.MODEL_NUMBER,"1.0"); - m_properties.put(UPnPDevice.MODEL_URL,"https://opensource.luminis.net/subversion/oss/projects/upnp-models/"); + m_properties.put(UPnPDevice.MODEL_URL,"http://incubator.apache/org/ace/upnp-models/"); m_properties.put(UPnPDevice.PRESENTATION_URL, "http://" + m_host + ":" + m_port + BASE_URL); m_properties.put(UPnPDevice.SERIAL_NUMBER,"123456789"); @@ -85,10 +96,8 @@ m_properties.put(UPnPService.ID, m_wrapper.getId()); m_properties.put(UPnPService.TYPE, m_wrapper.getType()); - } - public Dictionary getDescriptions(String name) { return m_properties; } @@ -109,19 +118,15 @@ return new UPnPService[]{m_wrapper}; } - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - + public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { response.setContentType("text/html"); PrintWriter out = response.getWriter(); out.println(""); - out.println("Luminis Provisioning Device"); + out.println("Apache ACE Device"); out.println(""); out.println("
"); - out.println("

Luminis Provisioning Device

"); + out.println("

Apache ACE Device

"); out.println("

Location: " + m_wrapper.getLocation() + ""); out.println("

Server Type: [" + m_wrapper.getServerType() + "]"); @@ -134,11 +139,8 @@ out.flush(); } - @Override - public void doPost(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { doGet(request, response); } - } Copied: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/UPnPConstants.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/UPnPConstants.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/UPnPConstants.java?p2=incubator/ace/trunk/server/src/org/apache/ace/location/upnp/UPnPConstants.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/UPnPConstants.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/UPnPConstants.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/UPnPConstants.java Sat Jun 27 20:21:28 2009 @@ -1,8 +1,24 @@ -package net.luminis.liq.location.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.location.upnp; public interface UPnPConstants { - public final static String PROVISIONING_DEVICE_TYPE = "urn:schemas-upnp-org:device:ProvisioningDevice:1"; public final static String LOCATION_SERVICE_TYPE = "urn:schemas-upnp-org:service:LocationService:1"; - } Copied: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/UPnPLocationServiceWrapper.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/UPnPLocationServiceWrapper.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/UPnPLocationServiceWrapper.java?p2=incubator/ace/trunk/server/src/org/apache/ace/location/upnp/UPnPLocationServiceWrapper.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/UPnPLocationServiceWrapper.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/location/upnp/UPnPLocationServiceWrapper.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/UPnPLocationServiceWrapper.java Sat Jun 27 20:21:28 2009 @@ -1,38 +1,46 @@ -package net.luminis.liq.location.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.location.upnp; import java.net.URL; import java.util.HashMap; import java.util.Map; -import net.luminis.liq.location.LocationService; -import net.luminis.liq.location.upnp.actions.GetLocationAction; -import net.luminis.liq.location.upnp.actions.GetServerLoadAction; -import net.luminis.liq.location.upnp.actions.GetServerTypeAction; - +import org.apache.ace.location.LocationService; +import org.apache.ace.location.upnp.actions.GetLocationAction; +import org.apache.ace.location.upnp.actions.GetServerLoadAction; +import org.apache.ace.location.upnp.actions.GetServerTypeAction; import org.osgi.service.upnp.UPnPAction; import org.osgi.service.upnp.UPnPService; import org.osgi.service.upnp.UPnPStateVariable; public class UPnPLocationServiceWrapper implements UPnPService, LocationService { - - final static private String SERVICE_ID = "urn:upnp-org:serviceId:LocationService:1"; - - //managed + private static final String SERVICE_ID = "urn:upnp-org:serviceId:LocationService:1"; private volatile LocationService m_ls; - - volatile private Map m_actions; - + private volatile Map m_actions; public UPnPLocationServiceWrapper() { - m_actions = new HashMap(); - UPnPAction location = new GetLocationAction(this); m_actions.put(location.getName(), location); - UPnPAction type = new GetServerTypeAction(this); m_actions.put(type.getName(), type); - UPnPAction load = new GetServerLoadAction(this); m_actions.put(load.getName(), load); } @@ -49,7 +57,6 @@ return (int)(40 + Math.random()*10); } - public UPnPAction getAction(String actionName) { return m_actions.get(actionName); } @@ -71,7 +78,7 @@ } public UPnPStateVariable[] getStateVariables() { - int i=0; + int i = 0; UPnPStateVariable[] states = new UPnPStateVariable[m_actions.size()]; for (UPnPAction action : m_actions.values()) { states[i++] = action.getStateVariable(null); @@ -83,11 +90,7 @@ return UPnPConstants.LOCATION_SERVICE_TYPE; } - public String getVersion() { return "1"; } - - - } \ No newline at end of file Modified: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetLocationAction.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetLocationAction.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetLocationAction.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetLocationAction.java Sat Jun 27 20:21:28 2009 @@ -1,11 +1,28 @@ -package net.luminis.liq.location.upnp.actions; +/* + * 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.location.upnp.actions; import java.net.URL; import java.util.Dictionary; import java.util.Hashtable; -import net.luminis.liq.location.LocationService; - +import org.apache.ace.location.LocationService; import org.osgi.service.upnp.UPnPAction; import org.osgi.service.upnp.UPnPStateVariable; @@ -18,7 +35,6 @@ private final LocationService m_locationService; - public GetLocationAction(LocationService ls) { m_locationService = ls; state = new StateVarImpl(); @@ -52,10 +68,7 @@ return result; } - private class StateVarImpl extends StateVar { - - public String getName() { return "Location"; } Modified: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetServerLoadAction.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetServerLoadAction.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetServerLoadAction.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetServerLoadAction.java Sat Jun 27 20:21:28 2009 @@ -1,14 +1,30 @@ -package net.luminis.liq.location.upnp.actions; +/* + * 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.location.upnp.actions; import java.util.Dictionary; import java.util.Hashtable; -import net.luminis.liq.location.LocationService; - +import org.apache.ace.location.LocationService; import org.osgi.service.upnp.UPnPAction; import org.osgi.service.upnp.UPnPStateVariable; - public class GetServerLoadAction implements UPnPAction { final private String NAME = "GetServerLoad"; @@ -54,8 +70,6 @@ } private class StateVarImpl extends StateVar { - - public String getName() { return "ServerLoad"; } @@ -87,5 +101,4 @@ return 1; } } - } Modified: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetServerTypeAction.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetServerTypeAction.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetServerTypeAction.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/GetServerTypeAction.java Sat Jun 27 20:21:28 2009 @@ -1,14 +1,30 @@ -package net.luminis.liq.location.upnp.actions; +/* + * 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.location.upnp.actions; import java.util.Dictionary; import java.util.Hashtable; -import net.luminis.liq.location.LocationService; - +import org.apache.ace.location.LocationService; import org.osgi.service.upnp.UPnPAction; import org.osgi.service.upnp.UPnPStateVariable; - public class GetServerTypeAction implements UPnPAction { final private String NAME = "GetServerType"; @@ -54,10 +70,7 @@ return result; } - private class StateVarImpl extends StateVar { - - public String getName() { return "ServerType"; } @@ -74,5 +87,4 @@ return TYPE_STRING; } } - } Modified: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/StateVar.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/StateVar.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/StateVar.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/actions/StateVar.java Sat Jun 27 20:21:28 2009 @@ -1,9 +1,26 @@ -package net.luminis.liq.location.upnp.actions; +package org.apache.ace.location.upnp.actions; import org.osgi.service.upnp.UPnPLocalStateVariable; +/* + * 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. + */ public abstract class StateVar implements UPnPLocalStateVariable { - public String[] getAllowedValues() { return null; } Modified: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/util/HostUtil.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/util/HostUtil.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/location/upnp/util/HostUtil.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/util/HostUtil.java Sat Jun 27 20:21:28 2009 @@ -1,28 +1,42 @@ -package net.luminis.liq.location.upnp.util; +/* + * 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.location.upnp.util; import java.net.InetAddress; import java.net.UnknownHostException; public class HostUtil { + private HostUtil() {} - private HostUtil(){} - - public static final String getHost() { String host; - + InetAddress inet; try { inet = InetAddress.getLocalHost(); host = inet.getHostAddress(); - } catch (UnknownHostException e) { + } + catch (UnknownHostException e) { System.out.println("Warning: enable to create host name"); host = "localhost"; } - + return host; } - - - } Modified: incubator/ace/trunk/server/src/org/apache/ace/location/upnp/util/Inspector.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/location/upnp/util/Inspector.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/location/upnp/util/Inspector.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/location/upnp/util/Inspector.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.location.upnp.util; +/* + * 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.location.upnp.util; import java.lang.reflect.Method; import java.util.ArrayList; @@ -10,49 +28,38 @@ import org.osgi.service.upnp.UPnPService; import org.osgi.service.upnp.UPnPStateVariable; - public class Inspector { - - - private static UPnPService createService(Class iface, Object target) throws Exception { Method[] methods = iface.getMethods(); - + List list = new ArrayList(); for (Method method : methods) { list.add(createAction(method, target)); } return null; } - - - + private static UPnPAction createAction(Method m, Object target) { return new UPnPActionImpl(m, target); } - - - - + private static class UPnPActionImpl implements UPnPAction { - private final Method m_method; private final Object m_target; - + public UPnPActionImpl(Method m, Object t) { m_method = m; m_target = t; } - - + public String getName() { return m_method.getName(); } - + public String[] getInputArgumentNames() { Class[] inputArgTypes = m_method.getParameterTypes(); String[] inputArgs = new String[inputArgTypes.length]; - + if (inputArgs.length == 1) { inputArgs[0] = inputArgTypes[0].getSimpleName(); } @@ -65,41 +72,38 @@ } return inputArgs; } - + public String[] getOutputArgumentNames() { return new String[]{getReturnArgumentName()}; } - + public String getReturnArgumentName() { Class returnType = m_method.getReturnType(); return returnType.getSimpleName(); } - + public UPnPStateVariable getStateVariable(String arg0) { // TODO Auto-generated method stub return null; } - + public Dictionary invoke(Dictionary dict) throws Exception { String[] argNames = getInputArgumentNames(); Object[] args = new Object[argNames.length]; - + int i=0; for (String name : argNames) { args[i++] = dict.get(name); } - + Object retVal = m_method.invoke(m_target, args); if (retVal==null) { return null; } - + Properties p = new Properties(); p.put(getReturnArgumentName(), retVal); return p; } - - - } } Copied: incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/MetadataGenerator.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/obr/metadata/MetadataGenerator.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/MetadataGenerator.java?p2=incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/MetadataGenerator.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/obr/metadata/MetadataGenerator.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/obr/metadata/MetadataGenerator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/MetadataGenerator.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.obr.metadata; +/* + * 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.obr.metadata; import java.io.File; import java.io.IOException; Modified: incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/bindex/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/bindex/Activator.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/bindex/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/bindex/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,7 +1,24 @@ -package net.luminis.liq.obr.metadata.bindex; - -import net.luminis.liq.obr.metadata.MetadataGenerator; +/* + * 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.obr.metadata.bindex; +import org.apache.ace.obr.metadata.MetadataGenerator; import org.apache.felix.dependencymanager.DependencyActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext; Modified: incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/bindex/BIndexMetadataGenerator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/bindex/BIndexMetadataGenerator.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/bindex/BIndexMetadataGenerator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/metadata/bindex/BIndexMetadataGenerator.java Sat Jun 27 20:21:28 2009 @@ -1,10 +1,27 @@ -package net.luminis.liq.obr.metadata.bindex; +/* + * 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.obr.metadata.bindex; import java.io.File; import java.io.IOException; -import net.luminis.liq.obr.metadata.MetadataGenerator; - +import org.apache.ace.obr.metadata.MetadataGenerator; import org.osgi.impl.bundle.bindex.Index; import org.osgi.service.log.LogService; @@ -13,7 +30,7 @@ private static final String INDEX_FILENAME = "repository"; private static final String INDEX_EXTENSION = ".xml"; - private LogService m_log; /* will be injected by dependencymanager */ + private volatile LogService m_log; /* will be injected by dependencymanager */ public void generateMetadata(File directory) throws IOException { if (directory.isDirectory()) { Modified: incubator/ace/trunk/server/src/org/apache/ace/obr/servlet/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/servlet/Activator.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/obr/servlet/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/servlet/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,16 +1,33 @@ -package net.luminis.liq.obr.servlet; +/* + * 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.obr.servlet; import javax.servlet.http.HttpServlet; -import net.luminis.liq.obr.storage.BundleStore; - +import org.apache.ace.obr.storage.BundleStore; import org.apache.felix.dependencymanager.DependencyActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; public class Activator extends DependencyActivatorBase { - public static final String PID = "net.luminis.liq.obr.servlet"; + public static final String PID = "org.apache.ace.obr.servlet"; @Override public void init(BundleContext context, DependencyManager manager) throws Exception { Modified: incubator/ace/trunk/server/src/org/apache/ace/obr/servlet/BundleServlet.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/servlet/BundleServlet.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/obr/servlet/BundleServlet.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/servlet/BundleServlet.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.obr.servlet; +/* + * 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.obr.servlet; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; @@ -11,8 +29,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.luminis.liq.obr.storage.BundleStore; - +import org.apache.ace.obr.storage.BundleStore; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; import org.osgi.service.log.LogService; Copied: incubator/ace/trunk/server/src/org/apache/ace/obr/storage/BundleStore.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/BundleStore.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/storage/BundleStore.java?p2=incubator/ace/trunk/server/src/org/apache/ace/obr/storage/BundleStore.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/BundleStore.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/BundleStore.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/storage/BundleStore.java Sat Jun 27 20:21:28 2009 @@ -1,10 +1,28 @@ -package net.luminis.liq.obr.storage; +package org.apache.ace.obr.storage; import java.io.IOException; import java.io.InputStream; import org.osgi.service.cm.ManagedService; +/* + * 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. + */ public interface BundleStore extends ManagedService { /** Copied: incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/Activator.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/file/Activator.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/Activator.java?p2=incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/Activator.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/file/Activator.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/file/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,15 +1,32 @@ -package net.luminis.liq.obr.storage.file; - -import net.luminis.liq.obr.metadata.MetadataGenerator; -import net.luminis.liq.obr.storage.BundleStore; +/* + * 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.obr.storage.file; +import org.apache.ace.obr.metadata.MetadataGenerator; +import org.apache.ace.obr.storage.BundleStore; import org.apache.felix.dependencymanager.DependencyActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; public class Activator extends DependencyActivatorBase { - public static final String PID = "net.luminis.liq.obr.storage.file"; + public static final String PID = "org.apache.ace.obr.storage.file"; @Override public void init(BundleContext context, DependencyManager manager) throws Exception { Copied: incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/BundleFileStore.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/file/BundleFileStore.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/BundleFileStore.java?p2=incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/BundleFileStore.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/file/BundleFileStore.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/obr/storage/file/BundleFileStore.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/BundleFileStore.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.obr.storage.file; +/* + * 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.obr.storage.file; import java.io.File; import java.io.FileInputStream; @@ -9,10 +27,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import net.luminis.liq.obr.metadata.MetadataGenerator; -import net.luminis.liq.obr.storage.BundleStore; -import net.luminis.liq.obr.storage.file.constants.OBRFileStoreConstants; - +import org.apache.ace.obr.metadata.MetadataGenerator; +import org.apache.ace.obr.storage.BundleStore; +import org.apache.ace.obr.storage.file.constants.OBRFileStoreConstants; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; import org.osgi.service.log.LogService; Modified: incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/constants/OBRFileStoreConstants.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/constants/OBRFileStoreConstants.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/constants/OBRFileStoreConstants.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/obr/storage/file/constants/OBRFileStoreConstants.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.obr.storage.file.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.obr.storage.file.constants; public interface OBRFileStoreConstants { public static final String FILE_LOCATION_KEY = "fileLocation"; Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/ext/BackupRepository.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/ext/BackupRepository.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/repository/ext/BackupRepository.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/ext/BackupRepository.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.repository.ext; +/* + * 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.repository.ext; import java.io.IOException; import java.io.InputStream; Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/ext/CachedRepository.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/ext/CachedRepository.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/repository/ext/CachedRepository.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/ext/CachedRepository.java Sat Jun 27 20:21:28 2009 @@ -1,10 +1,27 @@ -package net.luminis.liq.repository.ext; +/* + * 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.repository.ext; import java.io.IOException; import java.io.InputStream; -import net.luminis.liq.repository.Repository; - +import org.apache.ace.repository.Repository; /** * Provides a cached repository representation, allowing the storing of local changes, without Copied: incubator/ace/trunk/server/src/org/apache/ace/repository/impl/Activator.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/Activator.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/impl/Activator.java?p2=incubator/ace/trunk/server/src/org/apache/ace/repository/impl/Activator.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/Activator.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/impl/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,5 +1,22 @@ -package net.luminis.liq.repository.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.repository.impl; import java.util.Properties; @@ -16,7 +33,7 @@ @Override public void init(BundleContext context, DependencyManager manager) throws Exception { Properties props = new Properties(); - props.put(Constants.SERVICE_PID, "net.luminis.liq.server.repository.factory"); + props.put(Constants.SERVICE_PID, "org.apache.ace.server.repository.factory"); manager.add(createService() .setInterface(ManagedServiceFactory.class.getName(), props) .setImplementation(new RepositoryFactory(manager)) Copied: incubator/ace/trunk/server/src/org/apache/ace/repository/impl/CachedRepositoryImpl.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/CachedRepositoryImpl.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/impl/CachedRepositoryImpl.java?p2=incubator/ace/trunk/server/src/org/apache/ace/repository/impl/CachedRepositoryImpl.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/CachedRepositoryImpl.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/CachedRepositoryImpl.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/impl/CachedRepositoryImpl.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.repository.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.repository.impl; import java.io.ByteArrayInputStream; import java.io.File; @@ -6,12 +24,11 @@ import java.io.InputStream; import java.net.URL; -import net.luminis.liq.repository.RangeIterator; -import net.luminis.liq.repository.Repository; -import net.luminis.liq.repository.SortedRangeSet; -import net.luminis.liq.repository.ext.BackupRepository; -import net.luminis.liq.repository.ext.CachedRepository; - +import org.apache.ace.repository.RangeIterator; +import org.apache.ace.repository.Repository; +import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.repository.ext.BackupRepository; +import org.apache.ace.repository.ext.CachedRepository; import org.osgi.service.useradmin.User; /** @@ -145,5 +162,4 @@ } return result; } - } Copied: incubator/ace/trunk/server/src/org/apache/ace/repository/impl/FilebasedBackupRepository.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/FilebasedBackupRepository.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/impl/FilebasedBackupRepository.java?p2=incubator/ace/trunk/server/src/org/apache/ace/repository/impl/FilebasedBackupRepository.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/FilebasedBackupRepository.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/FilebasedBackupRepository.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/impl/FilebasedBackupRepository.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.repository.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.repository.impl; import java.io.ByteArrayInputStream; import java.io.File; @@ -9,7 +27,7 @@ import java.io.InputStream; import java.io.OutputStream; -import net.luminis.liq.repository.ext.BackupRepository; +import org.apache.ace.repository.ext.BackupRepository; /** * A file-based implementation of the Backup Repository, using two files to store the current Copied: incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RemoteRepository.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RemoteRepository.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RemoteRepository.java?p2=incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RemoteRepository.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RemoteRepository.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RemoteRepository.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RemoteRepository.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.repository.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.repository.impl; import java.io.BufferedReader; import java.io.IOException; @@ -11,9 +29,8 @@ import javax.servlet.http.HttpServletResponse; -import net.luminis.liq.repository.Repository; -import net.luminis.liq.repository.SortedRangeSet; - +import org.apache.ace.repository.Repository; +import org.apache.ace.repository.SortedRangeSet; /** * This class works as a local interface for a remote repository by handling the network Copied: incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RepositoryFactory.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RepositoryFactory.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RepositoryFactory.java?p2=incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RepositoryFactory.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RepositoryFactory.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RepositoryFactory.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RepositoryFactory.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.repository.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.repository.impl; import java.io.ByteArrayInputStream; import java.io.File; @@ -7,10 +25,9 @@ import java.util.HashMap; import java.util.Map; -import net.luminis.liq.repository.Repository; -import net.luminis.liq.repository.RepositoryReplication; -import net.luminis.liq.repository.impl.constants.RepositoryConstants; - +import org.apache.ace.repository.Repository; +import org.apache.ace.repository.RepositoryReplication; +import org.apache.ace.repository.impl.constants.RepositoryConstants; import org.apache.felix.dependencymanager.DependencyManager; import org.apache.felix.dependencymanager.Service; import org.osgi.framework.BundleContext; @@ -161,5 +178,4 @@ store.updated(isMaster); } } - } Copied: incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RepositoryImpl.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RepositoryImpl.java) URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RepositoryImpl.java?p2=incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RepositoryImpl.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RepositoryImpl.java&r1=788992&r2=789011&rev=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/net/luminis/liq/repository/impl/RepositoryImpl.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/impl/RepositoryImpl.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.repository.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.repository.impl; import java.io.File; import java.io.FileInputStream; @@ -8,10 +26,9 @@ import java.io.OutputStream; import java.util.Arrays; -import net.luminis.liq.repository.Repository; -import net.luminis.liq.repository.RepositoryReplication; -import net.luminis.liq.repository.SortedRangeSet; - +import org.apache.ace.repository.Repository; +import org.apache.ace.repository.RepositoryReplication; +import org.apache.ace.repository.SortedRangeSet; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.log.LogService; @@ -178,5 +195,4 @@ public synchronized void updated(boolean isMaster) throws ConfigurationException { m_isMaster = isMaster; } - } Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/impl/constants/RepositoryConstants.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/impl/constants/RepositoryConstants.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/repository/impl/constants/RepositoryConstants.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/impl/constants/RepositoryConstants.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.repository.impl.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.repository.impl.constants; public interface RepositoryConstants { public static final String REPOSITORY_NAME = "name"; Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/Activator.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,5 +1,22 @@ -package net.luminis.liq.repository.servlet; - +/* + * 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.repository.servlet; import javax.servlet.http.HttpServlet; @@ -9,8 +26,8 @@ import org.osgi.service.log.LogService; public class Activator extends DependencyActivatorBase { - public static final String REPOSITORY_PID = "net.luminis.liq.repository.servlet.RepositoryServlet"; - public static final String REPOSITORY_REPLICATION_PID = "net.luminis.liq.repository.servlet.RepositoryReplicationServlet"; + public static final String REPOSITORY_PID = "org.apache.ace.repository.servlet.RepositoryServlet"; + public static final String REPOSITORY_REPLICATION_PID = "org.apache.ace.repository.servlet.RepositoryReplicationServlet"; @Override public void init(BundleContext context, DependencyManager manager) throws Exception { Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryReplicationServlet.java Sat Jun 27 20:21:28 2009 @@ -1,12 +1,29 @@ -package net.luminis.liq.repository.servlet; +/* + * 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.repository.servlet; import java.io.IOException; import java.io.InputStream; import java.util.Dictionary; -import net.luminis.liq.repository.RepositoryReplication; -import net.luminis.liq.repository.SortedRangeSet; - +import org.apache.ace.repository.RepositoryReplication; +import org.apache.ace.repository.SortedRangeSet; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.service.cm.ConfigurationException; Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryServlet.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryServlet.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryServlet.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryServlet.java Sat Jun 27 20:21:28 2009 @@ -1,12 +1,29 @@ -package net.luminis.liq.repository.servlet; +/* + * 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.repository.servlet; import java.io.IOException; import java.io.InputStream; import java.util.Dictionary; -import net.luminis.liq.repository.Repository; -import net.luminis.liq.repository.SortedRangeSet; - +import org.apache.ace.repository.Repository; +import org.apache.ace.repository.SortedRangeSet; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; import org.osgi.service.cm.ConfigurationException; Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryServletBase.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryServletBase.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryServletBase.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/servlet/RepositoryServletBase.java Sat Jun 27 20:21:28 2009 @@ -1,4 +1,22 @@ -package net.luminis.liq.repository.servlet; +/* + * 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.repository.servlet; import java.io.IOException; import java.io.InputStream; @@ -10,8 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.luminis.liq.repository.SortedRangeSet; - +import org.apache.ace.repository.SortedRangeSet; import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/task/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/task/Activator.java?rev=789011&r1=788992&r2=789011&view=diff ============================================================================== --- incubator/ace/trunk/server/src/org/apache/ace/repository/task/Activator.java (original) +++ incubator/ace/trunk/server/src/org/apache/ace/repository/task/Activator.java Sat Jun 27 20:21:28 2009 @@ -1,9 +1,26 @@ -package net.luminis.liq.repository.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.repository.task; import java.util.Properties; -import net.luminis.liq.discovery.Discovery; - +import org.apache.ace.discovery.Discovery; import org.apache.felix.dependencymanager.DependencyActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext;