incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r789011 [5/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 GMT
Modified: incubator/ace/trunk/server/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/repository/task/RepositoryReplicationTask.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-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.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -7,11 +25,10 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.repository.RangeIterator;
-import net.luminis.liq.repository.RepositoryReplication;
-import net.luminis.liq.repository.SortedRangeSet;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.repository.RangeIterator;
+import org.apache.ace.repository.RepositoryReplication;
+import org.apache.ace.repository.SortedRangeSet;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;

Copied: incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
(from r788992, incubator/ace/trunk/server/src/net/luminis/liq/resourceprocessor/useradmin/UserAdminConfigurator.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java?p2=incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/resourceprocessor/useradmin/UserAdminConfigurator.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/resourceprocessor/useradmin/UserAdminConfigurator.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.resourceprocessor.useradmin;
+/*
+ * 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.resourceprocessor.useradmin;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Activator.java
Sat Jun 27 20:21:28 2009
@@ -1,9 +1,26 @@
-package net.luminis.liq.resourceprocessor.useradmin.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.resourceprocessor.useradmin.impl;
 
 import java.util.Properties;
 
-import net.luminis.liq.resourceprocessor.useradmin.UserAdminConfigurator;
-
+import org.apache.ace.resourceprocessor.useradmin.UserAdminConfigurator;
 import org.apache.felix.dependencymanager.DependencyActivatorBase;
 import org.apache.felix.dependencymanager.DependencyManager;
 import org.osgi.framework.BundleContext;
@@ -18,7 +35,7 @@
  * by the Deployment Admin.
  */
 public class Activator extends DependencyActivatorBase {
-    private static final String PID = "net.luminis.liq.resourceprocessor.useradmin";
+    private static final String PID = "org.apache.ace.resourceprocessor.useradmin";
 
     @Override
     public void init(BundleContext context, DependencyManager manager) {

Modified: incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Processor.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Processor.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Processor.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/Processor.java
Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.resourceprocessor.useradmin.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.resourceprocessor.useradmin.impl;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/ResourceStore.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/ResourceStore.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/ResourceStore.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/ResourceStore.java
Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.resourceprocessor.useradmin.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.resourceprocessor.useradmin.impl;
 
 import java.io.File;
 import java.io.FileInputStream;

Modified: incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java
Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.resourceprocessor.useradmin.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.resourceprocessor.useradmin.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,8 +33,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import net.luminis.liq.resourceprocessor.useradmin.UserAdminConfigurator;
-
+import org.apache.ace.resourceprocessor.useradmin.UserAdminConfigurator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.log.LogService;

Copied: incubator/ace/trunk/server/src/org/apache/ace/server/action/Action.java (from r788992,
incubator/ace/trunk/server/src/net/luminis/liq/server/action/Action.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/action/Action.java?p2=incubator/ace/trunk/server/src/org/apache/ace/server/action/Action.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/server/action/Action.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/server/action/Action.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/action/Action.java Sat Jun 27 20:21:28
2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.server.action;
+/*
+ * 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.server.action;
 
 import org.osgi.service.event.Event;
 
@@ -12,10 +30,9 @@
  */
 public interface Action {
     public static final String ACTION_NAME = Action.class.getName() + ".name";
-    
+
     /**
      * Handles an event, performing the main action of this Action.
      */
     public void handle(Event event);
-
 }

Copied: incubator/ace/trunk/server/src/org/apache/ace/server/action/MessageAction.java (from
r788992, incubator/ace/trunk/server/src/net/luminis/liq/server/action/MessageAction.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/action/MessageAction.java?p2=incubator/ace/trunk/server/src/org/apache/ace/server/action/MessageAction.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/server/action/MessageAction.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/server/action/MessageAction.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/action/MessageAction.java Sat Jun
27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.server.action;
+/*
+ * 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.server.action;
 
 /**
  * MessageAction is an action that sends out messages. To do so, it needs a user, and

Modified: incubator/ace/trunk/server/src/org/apache/ace/server/action/popupmessage/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/action/popupmessage/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/server/action/popupmessage/Activator.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/action/popupmessage/Activator.java
Sat Jun 27 20:21:28 2009
@@ -1,9 +1,26 @@
-package net.luminis.liq.server.action.popupmessage;
+/*
+ * 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.server.action.popupmessage;
 
 import java.util.Properties;
 
-import net.luminis.liq.server.action.Action;
-
+import org.apache.ace.server.action.Action;
 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/server/action/popupmessage/PopupMessageAction.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/action/popupmessage/PopupMessageAction.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/server/action/popupmessage/PopupMessageAction.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/action/popupmessage/PopupMessageAction.java
Sat Jun 27 20:21:28 2009
@@ -1,9 +1,26 @@
-package net.luminis.liq.server.action.popupmessage;
+/*
+ * 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.server.action.popupmessage;
 
 import javax.swing.JOptionPane;
 
-import net.luminis.liq.server.action.MessageAction;
-
+import org.apache.ace.server.action.MessageAction;
 import org.osgi.service.event.Event;
 import org.osgi.service.useradmin.User;
 

Copied: incubator/ace/trunk/server/src/org/apache/ace/server/log/Activator.java (from r788992,
incubator/ace/trunk/server/src/net/luminis/liq/server/log/Activator.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/log/Activator.java?p2=incubator/ace/trunk/server/src/org/apache/ace/server/log/Activator.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/server/log/Activator.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/server/log/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/log/Activator.java Sat Jun 27 20:21:28
2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.server.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.server.log;
 
 import java.util.Dictionary;
 import java.util.HashMap;
@@ -7,9 +25,8 @@
 
 import javax.servlet.http.HttpServlet;
 
-import net.luminis.liq.http.listener.constants.HttpConstants;
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.http.listener.constants.HttpConstants;
+import org.apache.ace.server.log.store.LogStore;
 import org.apache.felix.dependencymanager.DependencyActivatorBase;
 import org.apache.felix.dependencymanager.DependencyManager;
 import org.apache.felix.dependencymanager.Service;
@@ -30,7 +47,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.server.log.servlet.factory");
+        props.put(Constants.SERVICE_PID, "org.apache.ace.server.log.servlet.factory");
         manager.add(createService()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)

Copied: incubator/ace/trunk/server/src/org/apache/ace/server/log/LogServlet.java (from r788992,
incubator/ace/trunk/server/src/net/luminis/liq/server/log/LogServlet.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/log/LogServlet.java?p2=incubator/ace/trunk/server/src/org/apache/ace/server/log/LogServlet.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/server/log/LogServlet.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/server/log/LogServlet.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/log/LogServlet.java Sat Jun 27 20:21:28
2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.server.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.server.log;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -12,11 +30,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.repository.SortedRangeSet;
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.repository.SortedRangeSet;
+import org.apache.ace.server.log.store.LogStore;
 import org.osgi.service.log.LogService;
 
 /**
@@ -228,5 +245,4 @@
     public String getServletInfo() {
         return "Log Endpoint (channel=" + m_name + ")";
     }
-
 }

Copied: incubator/ace/trunk/server/src/org/apache/ace/server/log/store/LogStore.java (from
r788992, incubator/ace/trunk/server/src/net/luminis/liq/server/log/store/LogStore.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/log/store/LogStore.java?p2=incubator/ace/trunk/server/src/org/apache/ace/server/log/store/LogStore.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/server/log/store/LogStore.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/server/log/store/LogStore.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/log/store/LogStore.java Sat Jun 27
20:21:28 2009
@@ -1,30 +1,47 @@
-package net.luminis.liq.server.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.server.log.store;
 
 import java.io.IOException;
 import java.util.List;
 
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.log.LogDescriptor;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
 
 /**
  * Log store interface. Implementation of this service interface provide a persisted storage
for LogEvent logs.
  */
 public interface LogStore {
-	
+
     /**
      * Event topic that indicates a new LogEvent that has been added to the store. The name
      * of the log is available as EVENT_PROP_LOGNAME, the original LogEvent as EVENT_PROP_LOG_EVENT.
      */
     public static final String EVENT_TOPIC = LogStore.class.getName().replace('.', '/') +
"/LogEvent";
-    
+
     /**
-     * Event property key containing the name of the log on which the LogEvent has been added.

+     * Event property key containing the name of the log on which the LogEvent has been added.
      */
     public static final String EVENT_PROP_LOGNAME = "name";
-    
+
     /**
-     * Event property key containing the LogEvent that has been added. 
+     * Event property key containing the LogEvent that has been added.
      */
     public static final String EVENT_PROP_LOG_EVENT = "logEvent";
 
@@ -72,5 +89,4 @@
      * @throws IOException in case of any error.
      */
     public List<LogDescriptor> getDescriptors() throws IOException;
-
 }

Modified: incubator/ace/trunk/server/src/org/apache/ace/server/log/store/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/log/store/impl/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/server/log/store/impl/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/log/store/impl/Activator.java Sat
Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.server.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.server.log.store.impl;
 
 import java.io.File;
 import java.util.Dictionary;
@@ -6,8 +24,7 @@
 import java.util.Map;
 import java.util.Properties;
 
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.server.log.store.LogStore;
 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.server.log.store.factory");
+        props.put(Constants.SERVICE_PID, "org.apache.ace.server.log.store.factory");
         manager.add(createService()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)
@@ -85,5 +102,4 @@
             m_log.log(LogService.LOG_INFO, "Ignoring configuration update because factory
instance was already configured: " + name);
         }
     }
-
 }

Modified: incubator/ace/trunk/server/src/org/apache/ace/server/log/store/impl/LogStoreImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/log/store/impl/LogStoreImpl.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/server/log/store/impl/LogStoreImpl.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/log/store/impl/LogStoreImpl.java
Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.server.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.server.log.store.impl;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -15,11 +33,10 @@
 import java.util.List;
 import java.util.Map;
 
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.repository.SortedRangeSet;
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.repository.SortedRangeSet;
+import org.apache.ace.server.log.store.LogStore;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 
@@ -49,7 +66,7 @@
     }
 
     /**
-     * @see net.luminis.liq.server.log.store.LogStore#get(net.luminis.liq.log.LogDescriptor)
+     * @see org.apache.ace.server.log.store.LogStore#get(org.apache.ace.log.LogDescriptor)
      */
     public synchronized List<LogEvent> get(LogDescriptor descriptor) throws IOException
{
         final List<LogEvent> result = new ArrayList<LogEvent>();
@@ -82,7 +99,7 @@
     }
 
     /**
-     * @see net.luminis.liq.server.log.store.LogStore#getDescriptor(java.lang.String, long)
+     * @see org.apache.ace.server.log.store.LogStore#getDescriptor(java.lang.String, long)
      */
     public LogDescriptor getDescriptor(String gatewayID, long logID) throws IOException {
         List<Long> ids = new ArrayList<Long>();
@@ -98,7 +115,7 @@
     }
 
     /**
-     * @see net.luminis.liq.server.log.store.LogStore#getDescriptors(java.lang.String)
+     * @see org.apache.ace.server.log.store.LogStore#getDescriptors(java.lang.String)
      */
     public List<LogDescriptor> getDescriptors(String gatewayID) throws IOException
{
         File dir = new File(m_dir, gatewayIDToFilename(gatewayID));
@@ -115,7 +132,7 @@
     }
 
     /**
-     * @see net.luminis.liq.server.log.store.LogStore#getDescriptors()
+     * @see org.apache.ace.server.log.store.LogStore#getDescriptors()
      */
     public List<LogDescriptor> getDescriptors() throws IOException {
         List<LogDescriptor> result = new ArrayList<LogDescriptor>();
@@ -126,7 +143,7 @@
     }
 
     /**
-     * @see net.luminis.liq.server.log.store.LogStore#put(java.util.List)
+     * @see org.apache.ace.server.log.store.LogStore#put(java.util.List)
      */
     public void put(List<LogEvent> events) throws IOException {
         Map<String, Map<Long, List<LogEvent>>> sorted = sort(events);

Modified: incubator/ace/trunk/server/src/org/apache/ace/server/log/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/log/task/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/server/log/task/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/log/task/Activator.java Sat Jun 27
20:21:28 2009
@@ -1,14 +1,31 @@
-package net.luminis.liq.server.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.server.log.task;
 
 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.log.LogSync;
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.log.LogSync;
+import org.apache.ace.server.log.store.LogStore;
 import org.apache.felix.dependencymanager.DependencyActivatorBase;
 import org.apache.felix.dependencymanager.DependencyManager;
 import org.apache.felix.dependencymanager.Service;
@@ -29,7 +46,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.server.log.task.factory");
+        props.put(Constants.SERVICE_PID, "org.apache.ace.server.log.task.factory");
         manager.add(createService()
             .setInterface(ManagedServiceFactory.class.getName(), props)
             .setImplementation(this)

Modified: incubator/ace/trunk/server/src/org/apache/ace/server/log/task/LogSyncTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/server/log/task/LogSyncTask.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/server/log/task/LogSyncTask.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/server/log/task/LogSyncTask.java Sat Jun
27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.server.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.server.log.task;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -14,13 +32,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.luminis.liq.discovery.Discovery;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.log.LogSync;
-import net.luminis.liq.repository.SortedRangeSet;
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.log.LogSync;
+import org.apache.ace.repository.SortedRangeSet;
+import org.apache.ace.server.log.store.LogStore;
 import org.osgi.service.log.LogService;
 
 public class LogSyncTask implements Runnable, LogSync {

Modified: incubator/ace/trunk/server/src/org/apache/felix/deployment/rp/autoconf/impl/AutoConfResource.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/felix/deployment/rp/autoconf/impl/AutoConfResource.java?rev=789011&r1=789010&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/felix/deployment/rp/autoconf/impl/AutoConfResource.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/felix/deployment/rp/autoconf/impl/AutoConfResource.java
Sat Jun 27 20:21:28 2009
@@ -1,3 +1,21 @@
+/*
+ * 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.felix.deployment.rp.autoconf.impl;
 
 import java.util.Dictionary;
@@ -8,7 +26,7 @@
 	public String m_factoryPid;
 	public Dictionary m_oldProps;
 	public Dictionary m_newProps;
-	
+
 	public AutoConfResource(String pid, String factoryPid, Dictionary oldProps, Dictionary newProps)
{
 		m_pid = pid;
 		m_factoryPid = factoryPid;

Modified: incubator/ace/trunk/server/src/org/apache/felix/metatype/AD.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/felix/metatype/AD.java?rev=789011&r1=789010&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/felix/metatype/AD.java (original)
+++ incubator/ace/trunk/server/src/org/apache/felix/metatype/AD.java Sat Jun 27 20:21:28 2009
@@ -18,19 +18,18 @@
  */
 package org.apache.felix.metatype;
 
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.felix.metatype.internal.Activator;
 import org.osgi.service.log.LogService;
 import org.osgi.service.metatype.AttributeDefinition;
 
-
 /**
  * The <code>AD</code> class represents the <code>AD</code> element
of the
  * meta type descriptor.
- *
- * @author fmeschbe
  */
 public class AD
 {
@@ -166,7 +165,7 @@
     public String validate( String valueString )
     {
         // no validation if no min and max
-        if ( getMin() == null && getMax() == null && getOptionValues() ==
null )
+        if ( (getMin() == null) && (getMax() == null) && (getOptionValues()
== null) )
         {
             return null;
         }
@@ -313,7 +312,7 @@
      */
     public void setDefaultValue( String[] defaultValue )
     {
-        this.defaultValue = ( String[] ) defaultValue.clone();
+        this.defaultValue = defaultValue.clone();
     }
 
 
@@ -425,7 +424,7 @@
 
     protected Comparable convertToType( final String value )
     {
-        if ( value != null && value.length() > 0 )
+        if ( (value != null) && (value.length() > 0) )
         {
             try
             {

Modified: incubator/ace/trunk/server/src/org/apache/felix/metatype/Attribute.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/felix/metatype/Attribute.java?rev=789011&r1=789010&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/felix/metatype/Attribute.java (original)
+++ incubator/ace/trunk/server/src/org/apache/felix/metatype/Attribute.java Sat Jun 27 20:21:28
2009
@@ -1,4 +1,4 @@
-/* 
+/*
  * 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
@@ -18,7 +18,6 @@
  */
 package org.apache.felix.metatype;
 
-
 /**
  * The <code>Attribute</code> TODO
  *
@@ -46,17 +45,17 @@
 
     public String[] getContent()
     {
-        return ( String[] ) content.clone();
+        return content.clone();
     }
 
 
     public void addContent( String[] added )
     {
-        if ( added != null && added.length > 0 )
+        if ( (added != null) && (added.length > 0) )
         {
             if ( content == null )
             {
-                content = ( String[] ) added.clone();
+                content = added.clone();
             }
             else
             {



Mime
View raw message