You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2009/06/27 20:39:54 UTC
svn commit: r789007 - in /incubator/ace/trunk/liq: ./
src/net/luminis/liq/consolelogger/ src/net/luminis/liq/discovery/
src/net/luminis/liq/identification/ src/net/luminis/liq/log/
src/net/luminis/liq/repository/ src/net/luminis/liq/scheduler/constants...
Author: marrs
Date: Sat Jun 27 18:39:53 2009
New Revision: 789007
URL: http://svn.apache.org/viewvc?rev=789007&view=rev
Log:
Renamed packages to basename "org.apache.ace" and added license headers to each source file.
Added:
incubator/ace/trunk/liq/src/org/
incubator/ace/trunk/liq/src/org/apache/
incubator/ace/trunk/liq/src/org/apache/ace/
incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/
- copied from r788992, incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/
incubator/ace/trunk/liq/src/org/apache/ace/discovery/
- copied from r788992, incubator/ace/trunk/liq/src/net/luminis/liq/discovery/
incubator/ace/trunk/liq/src/org/apache/ace/identification/
- copied from r788992, incubator/ace/trunk/liq/src/net/luminis/liq/identification/
incubator/ace/trunk/liq/src/org/apache/ace/log/
- copied from r788992, incubator/ace/trunk/liq/src/net/luminis/liq/log/
incubator/ace/trunk/liq/src/org/apache/ace/repository/
- copied from r788992, incubator/ace/trunk/liq/src/net/luminis/liq/repository/
incubator/ace/trunk/liq/src/org/apache/ace/scheduler/
incubator/ace/trunk/liq/src/org/apache/ace/scheduler/constants/
- copied from r788992, incubator/ace/trunk/liq/src/net/luminis/liq/scheduler/constants/
incubator/ace/trunk/liq/src/org/apache/ace/util/
- copied from r788992, incubator/ace/trunk/liq/src/net/luminis/liq/util/
Removed:
incubator/ace/trunk/liq/src/net/luminis/liq/consolelogger/
incubator/ace/trunk/liq/src/net/luminis/liq/discovery/
incubator/ace/trunk/liq/src/net/luminis/liq/identification/
incubator/ace/trunk/liq/src/net/luminis/liq/log/
incubator/ace/trunk/liq/src/net/luminis/liq/repository/
incubator/ace/trunk/liq/src/net/luminis/liq/scheduler/constants/
incubator/ace/trunk/liq/src/net/luminis/liq/util/
incubator/ace/trunk/liq/src/org/apache/ace/log/AlertEvent.java
Modified:
incubator/ace/trunk/liq/build.xml
incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Activator.java
incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Logger.java
incubator/ace/trunk/liq/src/org/apache/ace/discovery/Discovery.java
incubator/ace/trunk/liq/src/org/apache/ace/identification/Identification.java
incubator/ace/trunk/liq/src/org/apache/ace/log/AuditEvent.java
incubator/ace/trunk/liq/src/org/apache/ace/log/Log.java
incubator/ace/trunk/liq/src/org/apache/ace/log/LogDescriptor.java
incubator/ace/trunk/liq/src/org/apache/ace/log/LogEvent.java
incubator/ace/trunk/liq/src/org/apache/ace/log/LogSync.java
incubator/ace/trunk/liq/src/org/apache/ace/repository/Range.java
incubator/ace/trunk/liq/src/org/apache/ace/repository/RangeIterator.java
incubator/ace/trunk/liq/src/org/apache/ace/repository/Repository.java
incubator/ace/trunk/liq/src/org/apache/ace/repository/RepositoryReplication.java
incubator/ace/trunk/liq/src/org/apache/ace/repository/SortedRangeSet.java
incubator/ace/trunk/liq/src/org/apache/ace/scheduler/constants/SchedulerConstants.java
incubator/ace/trunk/liq/src/org/apache/ace/util/Codec.java
incubator/ace/trunk/liq/src/org/apache/ace/util/VersionRange.java
Modified: incubator/ace/trunk/liq/build.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/build.xml?rev=789007&r1=789006&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/build.xml (original)
+++ incubator/ace/trunk/liq/build.xml Sat Jun 27 18:39:53 2009
@@ -225,15 +225,15 @@
<target name="package-liq" unless="liq.uptodate">
<project-bundle
- bundlename="Console Logger"
- bundlesymbolicname="net.luminis.liq.consolelogger"
- privatepackage="net.luminis.liq.consolelogger"
- bundleactivator="net.luminis.liq.consolelogger.Activator" />
- <project-bundle
- bundlename="Log Interfaces"
- bundlesymbolicname="net.luminis.liq.log"
- exportpackage="net.luminis.liq.log, net.luminis.liq.repository"
- privatepackage="net.luminis.liq.util" />
+ bundlename="Apache ACE Console Logger"
+ bundlesymbolicname="org.apache.ace.consolelogger"
+ privatepackage="org.apache.ace.consolelogger"
+ bundleactivator="org.apache.ace.consolelogger.Activator" />
+ <project-bundle
+ bundlename="Apache ACE Log Interfaces"
+ bundlesymbolicname="org.apache.ace.log"
+ exportpackage="org.apache.ace.log, org.apache.ace.repository"
+ privatepackage="org.apache.ace.util" />
</target>
<target name="package-server" unless="server.uptodate">
Modified: incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Activator.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Activator.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Activator.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.consolelogger;
+/*
+ * 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.consolelogger;
import org.apache.felix.dependencymanager.DependencyActivatorBase;
import org.apache.felix.dependencymanager.DependencyManager;
Modified: incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Logger.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Logger.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Logger.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/consolelogger/Logger.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.consolelogger;
+/*
+ * 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.consolelogger;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Modified: incubator/ace/trunk/liq/src/org/apache/ace/discovery/Discovery.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/discovery/Discovery.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/discovery/Discovery.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/discovery/Discovery.java Sat Jun 27 18:39:53 2009
@@ -1,16 +1,34 @@
-package net.luminis.liq.discovery;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.discovery;
import java.net.URL;
/**
- * The <code>Discovery</code> interface can be used to locate the Provisioning Server.
+ * Service interface that can be used to locate the server.
*/
public interface Discovery {
/**
- * Discovers the location of the Provisioning Server.
+ * Discovers the location of the server.
*
- * @return URL pointing to the base address of the Provisioning Server
+ * @return URL pointing to the base address of the server
*/
public URL discover();
Modified: incubator/ace/trunk/liq/src/org/apache/ace/identification/Identification.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/identification/Identification.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/identification/Identification.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/identification/Identification.java Sat Jun 27 18:39:53 2009
@@ -1,10 +1,26 @@
-package net.luminis.liq.identification;
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.identification;
/**
- * The <code>Identification</code> can be used to identify the system it is running on. This
- * identification is both unique and should not change. Nevertheless, don't cache the value
- * but simply ask this service when you need it.
+ * The Identification service can be used to identify the system it is running on. This
+ * identification must be unique and must not change.
*/
public interface Identification {
Modified: incubator/ace/trunk/liq/src/org/apache/ace/log/AuditEvent.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/log/AuditEvent.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/log/AuditEvent.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/log/AuditEvent.java Sat Jun 27 18:39:53 2009
@@ -1,7 +1,26 @@
-package net.luminis.liq.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log;
/**
- * Audit log event.
+ * Audit log event. These events are recorded in the audit log, which keeps track of
+ * all life cycle events that occur on a target.
*/
public interface AuditEvent {
Modified: incubator/ace/trunk/liq/src/org/apache/ace/log/Log.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/log/Log.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/log/Log.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/log/Log.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log;
import java.util.Dictionary;
Modified: incubator/ace/trunk/liq/src/org/apache/ace/log/LogDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/log/LogDescriptor.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/log/LogDescriptor.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/log/LogDescriptor.java Sat Jun 27 18:39:53 2009
@@ -1,10 +1,29 @@
-package net.luminis.liq.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
-import net.luminis.liq.repository.SortedRangeSet;
-import net.luminis.liq.util.Codec;
+import org.apache.ace.repository.SortedRangeSet;
+import org.apache.ace.util.Codec;
+
/**
@@ -101,5 +120,4 @@
result.append(Codec.encode(m_rangeSet.toRepresentation()));
return result.toString();
}
-
}
Modified: incubator/ace/trunk/liq/src/org/apache/ace/log/LogEvent.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/log/LogEvent.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/log/LogEvent.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/log/LogEvent.java Sat Jun 27 18:39:53 2009
@@ -1,11 +1,30 @@
-package net.luminis.liq.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Properties;
import java.util.StringTokenizer;
-import net.luminis.liq.util.Codec;
+import org.apache.ace.util.Codec;
+
/**
* Log event.
Modified: incubator/ace/trunk/liq/src/org/apache/ace/log/LogSync.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/log/LogSync.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/log/LogSync.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/log/LogSync.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.log;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.log;
import java.io.IOException;
Modified: incubator/ace/trunk/liq/src/org/apache/ace/repository/Range.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/repository/Range.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/repository/Range.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/repository/Range.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.repository;
+/*
+ * 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;
/**
* Class that captures a simple, modifiable range.
Modified: incubator/ace/trunk/liq/src/org/apache/ace/repository/RangeIterator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/repository/RangeIterator.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/repository/RangeIterator.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/repository/RangeIterator.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.repository;
+/*
+ * 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;
import java.util.Iterator;
import java.util.NoSuchElementException;
Modified: incubator/ace/trunk/liq/src/org/apache/ace/repository/Repository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/repository/Repository.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/repository/Repository.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/repository/Repository.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.repository;
+/*
+ * 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;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/ace/trunk/liq/src/org/apache/ace/repository/RepositoryReplication.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/repository/RepositoryReplication.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/repository/RepositoryReplication.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/repository/RepositoryReplication.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.repository;
+/*
+ * 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;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/ace/trunk/liq/src/org/apache/ace/repository/SortedRangeSet.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/repository/SortedRangeSet.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/repository/SortedRangeSet.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/repository/SortedRangeSet.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.repository;
+/*
+ * 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;
import java.util.ArrayList;
import java.util.Iterator;
@@ -158,7 +176,8 @@
/**
* Returns the highest value present in any of the ranges in this <code>SortredRangeSet</code>.
*
- * @return The highest value present in any of the ranges in this <code>SortredRangeSet</code> or <code>0</code> if the <code>SortedRangeSet</code> is empty.
+ * @return the highest value present in any of the ranges in this <code>SortredRangeSet</code>
+ * or <code>0</code> if the <code>SortedRangeSet</code> is empty.
*/
public long getHigh() {
int size = m_ranges.size();
Modified: incubator/ace/trunk/liq/src/org/apache/ace/scheduler/constants/SchedulerConstants.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/scheduler/constants/SchedulerConstants.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/scheduler/constants/SchedulerConstants.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/scheduler/constants/SchedulerConstants.java Sat Jun 27 18:39:53 2009
@@ -1,7 +1,25 @@
-package net.luminis.liq.scheduler.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.scheduler.constants;
public interface SchedulerConstants {
- public static final String SCHEDULER_PID = "net.luminis.liq.scheduler";
+ public static final String SCHEDULER_PID = "org.apache.ace.scheduler";
public static final String SCHEDULER_NAME_KEY = "taskName";
public static final String SCHEDULER_DESCRIPTION_KEY = "description";
public static final String SCHEDULER_RECIPE = "recipe";
Modified: incubator/ace/trunk/liq/src/org/apache/ace/util/Codec.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/util/Codec.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/util/Codec.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/util/Codec.java Sat Jun 27 18:39:53 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.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.util;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
Modified: incubator/ace/trunk/liq/src/org/apache/ace/util/VersionRange.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/src/org/apache/ace/util/VersionRange.java?rev=789007&r1=788992&r2=789007&view=diff
==============================================================================
--- incubator/ace/trunk/liq/src/org/apache/ace/util/VersionRange.java (original)
+++ incubator/ace/trunk/liq/src/org/apache/ace/util/VersionRange.java Sat Jun 27 18:39:53 2009
@@ -16,94 +16,81 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.luminis.liq.util;
+package org.apache.ace.util;
import org.osgi.framework.Version;
-public class VersionRange
-{
+public class VersionRange {
private Version m_low = null;
private boolean m_isLowInclusive = false;
private Version m_high = null;
private boolean m_isHighInclusive = false;
private String m_toString = null;
- public static final VersionRange infiniteRange = new VersionRange(Version.emptyVersion, true, null, true);
- public VersionRange(Version low, boolean isLowInclusive,
- Version high, boolean isHighInclusive)
- {
+ public static final VersionRange infiniteRange = new VersionRange(
+ Version.emptyVersion, true, null, true);
+
+ public VersionRange(Version low, boolean isLowInclusive, Version high, boolean isHighInclusive) {
m_low = low;
m_isLowInclusive = isLowInclusive;
m_high = high;
m_isHighInclusive = isHighInclusive;
}
- public Version getLow()
- {
+ public Version getLow() {
return m_low;
}
- public boolean isLowInclusive()
- {
+ public boolean isLowInclusive() {
return m_isLowInclusive;
}
- public Version getHigh()
- {
+ public Version getHigh() {
return m_high;
}
- public boolean isHighInclusive()
- {
+ public boolean isHighInclusive() {
return m_isHighInclusive;
}
- public boolean isInRange(Version version)
- {
+ public boolean isInRange(Version version) {
// We might not have an upper end to the range.
- if (m_high == null)
- {
+ if (m_high == null) {
return (version.compareTo(m_low) >= 0);
}
- else if (isLowInclusive() && isHighInclusive())
- {
- return (version.compareTo(m_low) >= 0) && (version.compareTo(m_high) <= 0);
+ else if (isLowInclusive() && isHighInclusive()) {
+ return (version.compareTo(m_low) >= 0) &&
+ (version.compareTo(m_high) <= 0);
}
- else if (isHighInclusive())
- {
- return (version.compareTo(m_low) > 0) && (version.compareTo(m_high) <= 0);
+ else if (isHighInclusive()) {
+ return (version.compareTo(m_low) > 0) &&
+ (version.compareTo(m_high) <= 0);
}
- else if (isLowInclusive())
- {
- return (version.compareTo(m_low) >= 0) && (version.compareTo(m_high) < 0);
+ else if (isLowInclusive()) {
+ return (version.compareTo(m_low) >= 0) &&
+ (version.compareTo(m_high) < 0);
}
- return (version.compareTo(m_low) > 0) && (version.compareTo(m_high) < 0);
+ return (version.compareTo(m_low) > 0) &&
+ (version.compareTo(m_high) < 0);
}
- public static VersionRange parse(String range)
- {
+ public static VersionRange parse(String range) {
// Check if the version is an interval.
- if (range.indexOf(',') >= 0)
- {
+ if (range.indexOf(',') >= 0) {
String s = range.substring(1, range.length() - 1);
String vlo = s.substring(0, s.indexOf(',')).trim();
String vhi = s.substring(s.indexOf(',') + 1, s.length()).trim();
- return new VersionRange (
- new Version(vlo), (range.charAt(0) == '['),
+ return new VersionRange(new Version(vlo), (range.charAt(0) == '['),
new Version(vhi), (range.charAt(range.length() - 1) == ']'));
}
- else
- {
+ else {
return new VersionRange(new Version(range), true, null, false);
}
}
- public String toString()
- {
- if (m_toString == null)
- {
- if (m_high != null)
- {
+ public String toString() {
+ if (m_toString == null) {
+ if (m_high != null) {
StringBuffer sb = new StringBuffer();
sb.append(m_isLowInclusive ? '[' : '(');
sb.append(m_low.toString());
@@ -112,8 +99,7 @@
sb.append(m_isHighInclusive ? ']' : ')');
m_toString = sb.toString();
}
- else
- {
+ else {
m_toString = m_low.toString();
}
}