ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r789011 [3/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/client/repository/object/DeploymentArtifact.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/DeploymentArtifact.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/DeploymentArtifact.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/DeploymentArtifact.java Sat Jun 27 20:21:28 2009
@@ -1,6 +1,22 @@
-package net.luminis.liq.client.repository.object;
-
-import java.net.URL;
+/*
+ * 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.client.repository.object;
 
 /**
  * Interface to a deployment artifact, which is used to gather information about
@@ -13,7 +29,7 @@
      * a resource processor (see OSGi compendium section 114.10).
      */
     public static final String DIRECTIVE_ISCUSTOMIZER = "DeploymentPackage-Customizer";
-    
+
     /**
      * Key, intended to be used for resources which require a resource processor
      * (see OSGi compendium section 114.10).
@@ -30,17 +46,16 @@
      * @return the URL for this deployment artifact.
      */
     public String getUrl();
-    
+
     /**
      * @param key A key String, such as the <code>DIRECTIVE_</code> constants in
      * <code>DeploymentArtifact</code>.
      * @return the value for the given directive key, or <code>null</code> if not found.
      */
     public String getDirective(String key);
-    
+
     /**
      * @return an array of all keys that are used in this object, to be used in <code>getDirective</code>.
      */
     public String[] getKeys();
-
 }

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java Sat Jun 27 20:21:28 2009
@@ -1,6 +1,24 @@
-package net.luminis.liq.client.repository.object;
+/*
+ * 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.client.repository.object;
 
-import net.luminis.liq.client.repository.RepositoryObject;
+import org.apache.ace.client.repository.RepositoryObject;
 
 /**
  * The interface to a DeploymentVersion. The basic functionality is defined
@@ -13,9 +31,9 @@
 
     public static final String KEY_GATEWAYID = "gatewayID";
     public static final String KEY_VERSION = "version";
-    
+
     public static final String TOPIC_ENTITY_ROOT = DeploymentVersionObject.class.getSimpleName() + "/";
-    
+
     public static final String TOPIC_ADDED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ADDED_SUFFIX;
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
@@ -33,7 +51,7 @@
 
     /**
      * @return an array of all deployment artifacts that will be part of this deployment version.
-     * The order of the artifacts in the array is equal to the order they should appear in a 
+     * The order of the artifacts in the array is equal to the order they should appear in a
      * deployment package.
      */
     public DeploymentArtifact[] getDeploymentArtifacts();

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/GatewayObject.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/GatewayObject.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/GatewayObject.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/GatewayObject.java Sat Jun 27 20:21:28 2009
@@ -1,15 +1,33 @@
-package net.luminis.liq.client.repository.object;
+/*
+ * 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.client.repository.object;
 
 import java.util.List;
 
-import net.luminis.liq.client.repository.RepositoryObject;
+import org.apache.ace.client.repository.RepositoryObject;
 
 public interface GatewayObject extends RepositoryObject {
     public static final String KEY_ID = "id";
     public static final String KEY_AUTO_APPROVE = "autoapprove";
 
     public static final String TOPIC_ENTITY_ROOT = GatewayObject.class.getSimpleName() + "/";
-    
+
     public static final String TOPIC_ADDED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ADDED_SUFFIX;
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/Group2LicenseAssociation.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/Group2LicenseAssociation.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/Group2LicenseAssociation.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/Group2LicenseAssociation.java Sat Jun 27 20:21:28 2009
@@ -1,13 +1,31 @@
-package net.luminis.liq.client.repository.object;
+/*
+ * 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.client.repository.object;
 
-import net.luminis.liq.client.repository.Association;
+import org.apache.ace.client.repository.Association;
 
 /**
  * Interface to a Group2LicenseAssociation. Most functionality is defined by the generic Association.
  */
 public interface Group2LicenseAssociation extends Association<GroupObject, LicenseObject> {
     public static final String TOPIC_ENTITY_ROOT = Group2LicenseAssociation.class.getSimpleName() + "/";
-    
+
     public static final String TOPIC_ADDED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ADDED_SUFFIX;
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/GroupObject.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/GroupObject.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/GroupObject.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/GroupObject.java Sat Jun 27 20:21:28 2009
@@ -1,8 +1,26 @@
-package net.luminis.liq.client.repository.object;
+/*
+ * 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.client.repository.object;
 
 import java.util.List;
 
-import net.luminis.liq.client.repository.RepositoryObject;
+import org.apache.ace.client.repository.RepositoryObject;
 
 /**
  * Interface to a GroupObject. The basic functionality is defined by RepositoryObject, but extended for
@@ -13,7 +31,7 @@
     public static final String KEY_NAME = "name";
 
     public static final String TOPIC_ENTITY_ROOT = GroupObject.class.getSimpleName() + "/";
-    
+
     public static final String TOPIC_ADDED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ADDED_SUFFIX;
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;
@@ -55,6 +73,4 @@
      * Sets the description of this bundle.
      */
     public void setDescription(String description);
-
-
 }

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/License2GatewayAssociation.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/License2GatewayAssociation.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/License2GatewayAssociation.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/License2GatewayAssociation.java Sat Jun 27 20:21:28 2009
@@ -1,13 +1,31 @@
-package net.luminis.liq.client.repository.object;
+/*
+ * 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.client.repository.object;
 
-import net.luminis.liq.client.repository.Association;
+import org.apache.ace.client.repository.Association;
 
 /**
  * Interface to a License2GatewayAssociation. Most functionality is defined by the generic Association.
  */
 public interface License2GatewayAssociation extends Association<LicenseObject, GatewayObject> {
     public static final String TOPIC_ENTITY_ROOT = License2GatewayAssociation.class.getSimpleName() + "/";
-    
+
     public static final String TOPIC_ADDED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ADDED_SUFFIX;
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/LicenseObject.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/LicenseObject.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/LicenseObject.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/object/LicenseObject.java Sat Jun 27 20:21:28 2009
@@ -1,8 +1,26 @@
-package net.luminis.liq.client.repository.object;
+/*
+ * 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.client.repository.object;
 
 import java.util.List;
 
-import net.luminis.liq.client.repository.RepositoryObject;
+import org.apache.ace.client.repository.RepositoryObject;
 
 /**
  * Interface to a LicenseObject. The basic functionality is defined by RepositoryObject, but extended for
@@ -10,7 +28,7 @@
  */
 public interface LicenseObject extends RepositoryObject {
     public static final String TOPIC_ENTITY_ROOT = LicenseObject.class.getSimpleName() + "/";
-    
+
     public static final String TOPIC_ADDED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_ADDED_SUFFIX;
     public static final String TOPIC_REMOVED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_REMOVED_SUFFIX;
     public static final String TOPIC_CHANGED = PUBLIC_TOPIC_ROOT + TOPIC_ENTITY_ROOT + TOPIC_CHANGED_SUFFIX;

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/Artifact2GroupAssociationRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/Artifact2GroupAssociationRepository.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/Artifact2GroupAssociationRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/Artifact2GroupAssociationRepository.java Sat Jun 27 20:21:28 2009
@@ -1,9 +1,27 @@
-package net.luminis.liq.client.repository.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.client.repository.repository;
 
-import net.luminis.liq.client.repository.AssociationRepository;
-import net.luminis.liq.client.repository.object.Artifact2GroupAssociation;
-import net.luminis.liq.client.repository.object.ArtifactObject;
-import net.luminis.liq.client.repository.object.GroupObject;
+import org.apache.ace.client.repository.AssociationRepository;
+import org.apache.ace.client.repository.object.Artifact2GroupAssociation;
+import org.apache.ace.client.repository.object.ArtifactObject;
+import org.apache.ace.client.repository.object.GroupObject;
 
 /**
  * Interface to a Artifact2GroupAssociationRepository. The functionality is defined by the generic AssociationRepository.

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/ArtifactRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/ArtifactRepository.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/ArtifactRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/ArtifactRepository.java Sat Jun 27 20:21:28 2009
@@ -1,13 +1,30 @@
-package net.luminis.liq.client.repository.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.client.repository.repository;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 
-import net.luminis.liq.client.repository.ObjectRepository;
-import net.luminis.liq.client.repository.helper.PropertyResolver;
-import net.luminis.liq.client.repository.object.ArtifactObject;
-import net.luminis.liq.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.ObjectRepository;
+import org.apache.ace.client.repository.object.ArtifactObject;
+import org.apache.ace.client.repository.object.GatewayObject;
 
 /**
  * Interface to a ArtifactRepository. The functionality is defined by the generic AssociationRepository.
@@ -17,7 +34,7 @@
 	 * Gets a list of all ArtifactObject's which are resource processing bundles.
 	 */
 	public List<ArtifactObject> getResourceProcessors();
-	
+
 	/**
 	 * Tries to import an artifact into storage, while extracting necessary metadata.
 	 * @param artifact a URL pointing to the 'physical' artifact.
@@ -29,7 +46,7 @@
 	 * @throws IOException when there is a problem transferring the <code>artifact</code> to storage.
 	 */
 	public ArtifactObject importArtifact(URL artifact, boolean upload) throws IllegalArgumentException, IOException;
-	
+
 	/**
 	 * Checks whether an artifact is 'usable', that is, there is a resource processor available for it,
 	 * if necessary.
@@ -38,24 +55,24 @@
 	 * otherwise, including when the artifact cannot be reached.
 	 */
 	public boolean recognizeArtifact(URL artifact);
-	
+
     /**
      * Tries to import an artifact into storage, while extracting necessary metadata.
      * @param artifact a URL pointing to the 'physical' artifact.
      * @param mimetype a String giving this object's mimetype.
      * @param upload Indicates whether this artifact should be uploaded to our own OBR.
      * @return An <code>ArtifactObject</code> representing the passed in artifact, if
-     * (a) there is storage available and (b) there is a resource processor 
+     * (a) there is storage available and (b) there is a resource processor
      * available for this type of artifact.
      * @throws IllegalArgumentException when the <code>artifact</code> cannot be processed.
      * @throws IOException when there is a problem transferring the <code>artifact</code> to storage.
      */
 	public ArtifactObject importArtifact(URL artifact, String mimetype, boolean upload) throws IllegalArgumentException, IOException;
-	
+
 	/**
 	 * Tries to locate a preprocessor for the passed artifact, an processes it. If no processing
 	 * needs to be done, the original artifact's URL will be returned.
-	 * @param artifact An artifact 
+	 * @param artifact An artifact
 	 * @param props A tree of properties objects, to be used for replacement.
 	 * @param gatewayID The gatewayID of the gateway for which this artifact is being processed.
 	 * @param version The deployment version for which this artifact is being processed.
@@ -63,10 +80,10 @@
      * @throws IOException Thrown if reading the original artifact goes wrong, or storing the processed one.
 	 */
 	public String preprocessArtifact(ArtifactObject artifact, GatewayObject gateway, String gatewayID, String version) throws IOException ;
-	
+
     /**
      * Indicates whether the template should be processed again, given the properties, and the version to which it
-     * should be compared. 
+     * should be compared.
      * @param url A string representing a URL to the original artifact.
      * @param props A PropertyResolver which can be used to fill in 'holes' in the template.
      * @param gatewayID The gatewayID of the gateway for which this artifact is being processed.
@@ -75,10 +92,10 @@
      * @param newVersion The new, potential version.
      * @param obrBase A base OBR to upload the new artifact to.
      * @return Whether or not a new version has to be created.
-     * @throws IOException 
+     * @throws IOException
      */
     public boolean needsNewVersion(ArtifactObject artifact, GatewayObject gateway, String gatewayID, String fromVersion);
-	
+
 	/**
 	 * Sets the OBR that this artifact repository should use to upload artifacts to.
 	 */

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java Sat Jun 27 20:21:28 2009
@@ -1,11 +1,12 @@
-package net.luminis.liq.client.repository.repository;
+package org.apache.ace.client.repository.repository;
 
 import java.util.List;
 import java.util.Map;
 
-import net.luminis.liq.client.repository.ObjectRepository;
-import net.luminis.liq.client.repository.object.DeploymentArtifact;
-import net.luminis.liq.client.repository.object.DeploymentVersionObject;
+import org.apache.ace.client.repository.ObjectRepository;
+import org.apache.ace.client.repository.object.DeploymentArtifact;
+import org.apache.ace.client.repository.object.DeploymentVersionObject;
+
 
 /**
  * Interface to a DeploymentVersionRepository. The functionality is defined by the generic ObjectRepository.

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/GatewayRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/GatewayRepository.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/GatewayRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/GatewayRepository.java Sat Jun 27 20:21:28 2009
@@ -1,7 +1,25 @@
-package net.luminis.liq.client.repository.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.client.repository.repository;
 
-import net.luminis.liq.client.repository.ObjectRepository;
-import net.luminis.liq.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.ObjectRepository;
+import org.apache.ace.client.repository.object.GatewayObject;
 
 /**
  * Interface to a GatewayRepository. The functionality is defined by the generic AssociationRepository.

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/Group2LicenseAssociationRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/Group2LicenseAssociationRepository.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/Group2LicenseAssociationRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/Group2LicenseAssociationRepository.java Sat Jun 27 20:21:28 2009
@@ -1,9 +1,27 @@
-package net.luminis.liq.client.repository.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.client.repository.repository;
 
-import net.luminis.liq.client.repository.AssociationRepository;
-import net.luminis.liq.client.repository.object.Group2LicenseAssociation;
-import net.luminis.liq.client.repository.object.GroupObject;
-import net.luminis.liq.client.repository.object.LicenseObject;
+import org.apache.ace.client.repository.AssociationRepository;
+import org.apache.ace.client.repository.object.Group2LicenseAssociation;
+import org.apache.ace.client.repository.object.GroupObject;
+import org.apache.ace.client.repository.object.LicenseObject;
 
 /**
  * Interface to a Group2LicenseAssociationRepository. The functionality is defined by the generic AssociationRepository.

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/GroupRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/GroupRepository.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/GroupRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/GroupRepository.java Sat Jun 27 20:21:28 2009
@@ -1,7 +1,25 @@
-package net.luminis.liq.client.repository.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.client.repository.repository;
 
-import net.luminis.liq.client.repository.ObjectRepository;
-import net.luminis.liq.client.repository.object.GroupObject;
+import org.apache.ace.client.repository.ObjectRepository;
+import org.apache.ace.client.repository.object.GroupObject;
 
 /**
  * Interface to a GroupRepository. The functionality is defined by the generic AssociationRepository.

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/License2GatewayAssociationRepository.java Sat Jun 27 20:21:28 2009
@@ -1,9 +1,27 @@
-package net.luminis.liq.client.repository.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.client.repository.repository;
 
-import net.luminis.liq.client.repository.AssociationRepository;
-import net.luminis.liq.client.repository.object.GatewayObject;
-import net.luminis.liq.client.repository.object.License2GatewayAssociation;
-import net.luminis.liq.client.repository.object.LicenseObject;
+import org.apache.ace.client.repository.AssociationRepository;
+import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.License2GatewayAssociation;
+import org.apache.ace.client.repository.object.LicenseObject;
 
 /**
  * Interface to a License2GatewayAssociationRepository. The functionality is defined by the generic AssociationRepository.

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/LicenseRepository.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/LicenseRepository.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/LicenseRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/repository/LicenseRepository.java Sat Jun 27 20:21:28 2009
@@ -1,7 +1,25 @@
-package net.luminis.liq.client.repository.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.client.repository.repository;
 
-import net.luminis.liq.client.repository.ObjectRepository;
-import net.luminis.liq.client.repository.object.LicenseObject;
+import org.apache.ace.client.repository.ObjectRepository;
+import org.apache.ace.client.repository.object.LicenseObject;
 
 /**
  * Interface to a LicenseRepository. The functionality is defined by the generic AssociationRepository.

Copied: incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/client/repository/stateful/StatefulGatewayObject.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java?p2=incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/client/repository/stateful/StatefulGatewayObject.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/client/repository/stateful/StatefulGatewayObject.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/StatefulGatewayObject.java Sat Jun 27 20:21:28 2009
@@ -1,14 +1,32 @@
-package net.luminis.liq.client.repository.stateful;
+/*
+ * 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.client.repository.stateful;
 
 import java.util.List;
 
-import net.luminis.liq.client.repository.RepositoryObject;
-import net.luminis.liq.client.repository.object.ArtifactObject;
-import net.luminis.liq.client.repository.object.DeploymentArtifact;
-import net.luminis.liq.client.repository.object.GatewayObject;
-import net.luminis.liq.client.repository.object.License2GatewayAssociation;
-import net.luminis.liq.client.repository.object.LicenseObject;
-import net.luminis.liq.log.LogEvent;
+import org.apache.ace.client.repository.RepositoryObject;
+import org.apache.ace.client.repository.object.ArtifactObject;
+import org.apache.ace.client.repository.object.DeploymentArtifact;
+import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.License2GatewayAssociation;
+import org.apache.ace.client.repository.object.LicenseObject;
+import org.apache.ace.log.LogEvent;
 
 /**
  * <code>StatefulGatewayObject</code> represents the information that a <code>GatewayObject</code>
@@ -92,7 +110,7 @@
      * repository, and the deployment repository. This will generate a new version in the
      * deployment repository.
      * @return The number of the new version.
-     * @throws IllegalStateException when it is currently not possible to create a deployment version. 
+     * @throws IllegalStateException when it is currently not possible to create a deployment version.
      */
     public String approve();
 
@@ -186,6 +204,4 @@
     public enum ProvisioningState {
         Idle, InProgress, OK, Failed;
     }
-
-
 }

Copied: incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/client/repository/stateful/StatefulGatewayRepository.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java?p2=incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/client/repository/stateful/StatefulGatewayRepository.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/client/repository/stateful/StatefulGatewayRepository.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/StatefulGatewayRepository.java Sat Jun 27 20:21:28 2009
@@ -1,8 +1,26 @@
-package net.luminis.liq.client.repository.stateful;
+/*
+ * 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.client.repository.stateful;
 
 import java.util.Map;
 
-import net.luminis.liq.client.repository.ObjectRepository;
+import org.apache.ace.client.repository.ObjectRepository;
 
 /**
  * Represents a repository of <ode>StatefulGatewayObject</code>'s.

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/Activator.java Sat Jun 27 20:21:28 2009
@@ -1,24 +1,41 @@
-package net.luminis.liq.client.repository.stateful.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.client.repository.stateful.impl;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import net.luminis.liq.client.repository.RepositoryAdmin;
-import net.luminis.liq.client.repository.helper.bundle.BundleHelper;
-import net.luminis.liq.client.repository.object.Artifact2GroupAssociation;
-import net.luminis.liq.client.repository.object.ArtifactObject;
-import net.luminis.liq.client.repository.object.DeploymentVersionObject;
-import net.luminis.liq.client.repository.object.GatewayObject;
-import net.luminis.liq.client.repository.object.Group2LicenseAssociation;
-import net.luminis.liq.client.repository.object.GroupObject;
-import net.luminis.liq.client.repository.object.License2GatewayAssociation;
-import net.luminis.liq.client.repository.object.LicenseObject;
-import net.luminis.liq.client.repository.repository.ArtifactRepository;
-import net.luminis.liq.client.repository.repository.DeploymentVersionRepository;
-import net.luminis.liq.client.repository.repository.GatewayRepository;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayRepository;
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.client.repository.RepositoryAdmin;
+import org.apache.ace.client.repository.helper.bundle.BundleHelper;
+import org.apache.ace.client.repository.object.Artifact2GroupAssociation;
+import org.apache.ace.client.repository.object.ArtifactObject;
+import org.apache.ace.client.repository.object.DeploymentVersionObject;
+import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.Group2LicenseAssociation;
+import org.apache.ace.client.repository.object.GroupObject;
+import org.apache.ace.client.repository.object.License2GatewayAssociation;
+import org.apache.ace.client.repository.object.LicenseObject;
+import org.apache.ace.client.repository.repository.ArtifactRepository;
+import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
+import org.apache.ace.client.repository.repository.GatewayRepository;
+import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.server.log.store.LogStore;
 import org.apache.felix.dependencymanager.DependencyActivatorBase;
 import org.apache.felix.dependencymanager.DependencyManager;
 import org.osgi.framework.BundleContext;
@@ -66,5 +83,4 @@
     public synchronized void destroy(BundleContext context, DependencyManager manager) throws Exception {
         // service deregistration will happen automatically.
     }
-
 }

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/StatefulGatewayObjectImpl.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.client.repository.stateful.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.client.repository.stateful.impl;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -12,18 +30,18 @@
 import java.util.NoSuchElementException;
 import java.util.Properties;
 
-import net.luminis.liq.client.repository.Associatable;
-import net.luminis.liq.client.repository.Association;
-import net.luminis.liq.client.repository.object.ArtifactObject;
-import net.luminis.liq.client.repository.object.DeploymentArtifact;
-import net.luminis.liq.client.repository.object.DeploymentVersionObject;
-import net.luminis.liq.client.repository.object.GatewayObject;
-import net.luminis.liq.client.repository.object.License2GatewayAssociation;
-import net.luminis.liq.client.repository.object.LicenseObject;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayObject;
-import net.luminis.liq.log.AuditEvent;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.log.LogEvent;
+import org.apache.ace.client.repository.Associatable;
+import org.apache.ace.client.repository.Association;
+import org.apache.ace.client.repository.object.ArtifactObject;
+import org.apache.ace.client.repository.object.DeploymentArtifact;
+import org.apache.ace.client.repository.object.DeploymentVersionObject;
+import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.License2GatewayAssociation;
+import org.apache.ace.client.repository.object.LicenseObject;
+import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.log.AuditEvent;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
 
 /**
  * A <code>StatefulGatewayObjectImpl</code> uses the interface of a <code>StatefulGatewayObject</code>,
@@ -695,5 +713,4 @@
     public Comparator getComparator() {
         throw new UnsupportedOperationException("A StatefulGatewayObject cannot return a comparator; use the underlying GatewayObject instead.");
     }
-
 }

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.client.repository.stateful.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.client.repository.stateful.impl;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -12,25 +30,24 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import net.luminis.liq.client.repository.RepositoryAdmin;
-import net.luminis.liq.client.repository.RepositoryObject;
-import net.luminis.liq.client.repository.RepositoryUtil;
-import net.luminis.liq.client.repository.helper.bundle.BundleHelper;
-import net.luminis.liq.client.repository.object.ArtifactObject;
-import net.luminis.liq.client.repository.object.DeploymentArtifact;
-import net.luminis.liq.client.repository.object.DeploymentVersionObject;
-import net.luminis.liq.client.repository.object.GatewayObject;
-import net.luminis.liq.client.repository.object.GroupObject;
-import net.luminis.liq.client.repository.object.LicenseObject;
-import net.luminis.liq.client.repository.repository.ArtifactRepository;
-import net.luminis.liq.client.repository.repository.DeploymentVersionRepository;
-import net.luminis.liq.client.repository.repository.GatewayRepository;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayObject;
-import net.luminis.liq.client.repository.stateful.StatefulGatewayRepository;
-import net.luminis.liq.log.LogEvent;
-import net.luminis.liq.log.LogDescriptor;
-import net.luminis.liq.server.log.store.LogStore;
-
+import org.apache.ace.client.repository.RepositoryAdmin;
+import org.apache.ace.client.repository.RepositoryObject;
+import org.apache.ace.client.repository.RepositoryUtil;
+import org.apache.ace.client.repository.helper.bundle.BundleHelper;
+import org.apache.ace.client.repository.object.ArtifactObject;
+import org.apache.ace.client.repository.object.DeploymentArtifact;
+import org.apache.ace.client.repository.object.DeploymentVersionObject;
+import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.GroupObject;
+import org.apache.ace.client.repository.object.LicenseObject;
+import org.apache.ace.client.repository.repository.ArtifactRepository;
+import org.apache.ace.client.repository.repository.DeploymentVersionRepository;
+import org.apache.ace.client.repository.repository.GatewayRepository;
+import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.log.LogDescriptor;
+import org.apache.ace.log.LogEvent;
+import org.apache.ace.server.log.store.LogStore;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;

Copied: incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java (from r788992, incubator/ace/trunk/server/src/net/luminis/liq/client/repositoryuseradmin/RepositoryUserAdmin.java)
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java?p2=incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java&p1=incubator/ace/trunk/server/src/net/luminis/liq/client/repositoryuseradmin/RepositoryUserAdmin.java&r1=788992&r2=789011&rev=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/net/luminis/liq/client/repositoryuseradmin/RepositoryUserAdmin.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/RepositoryUserAdmin.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.client.repositoryuseradmin;
+/*
+ * 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.client.repositoryuseradmin;
 
 import java.io.IOException;
 import java.net.URL;
@@ -9,7 +27,7 @@
 /**
  * RepositoryUserAdmin is used for managing a User Admin repository
  * that is present on a server. It uses the UserAdmin interface to
- * allow alterations. Any non-supported functions from UserAdmin 
+ * allow alterations. Any non-supported functions from UserAdmin
  * (or its related classes) will result in a {@link UnsupportedOperationException}.<br>
  * <br>
  * This service uses the same checkout/commit/revert scheme that
@@ -30,14 +48,14 @@
      * @throws IOException Thrown when there is a problem handling the backup files.
      */
     public void login(User user, URL repositoryLocation, String repositoryCustomer, String repositoryName) throws IOException;
-    
+
     /**
      * Logs out the user.
      * @param force Even when something goes wrong, force a logout.
      * @throws IOException When there is a problem writing the current status to local storage.
      */
     public void logout(boolean force) throws IOException;
-    
+
     /**
      * Checks out the latest version from the server. If any changes exist, they will
      * be reflected in this service's user admin.

Modified: incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/impl/Activator.java Sat Jun 27 20:21:28 2009
@@ -1,7 +1,24 @@
-package net.luminis.liq.client.repositoryuseradmin.impl;
-
-import net.luminis.liq.client.repositoryuseradmin.RepositoryUserAdmin;
+/*
+ * 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.client.repositoryuseradmin.impl;
 
+import org.apache.ace.client.repositoryuseradmin.RepositoryUserAdmin;
 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/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/client/repositoryuseradmin/impl/RepositoryUserAdminImpl.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.client.repositoryuseradmin.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.client.repositoryuseradmin.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,13 +38,12 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import net.luminis.liq.client.repositoryuseradmin.RepositoryUserAdmin;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.repository.ext.CachedRepository;
-import net.luminis.liq.repository.impl.CachedRepositoryImpl;
-import net.luminis.liq.repository.impl.FilebasedBackupRepository;
-import net.luminis.liq.repository.impl.RemoteRepository;
-
+import org.apache.ace.client.repositoryuseradmin.RepositoryUserAdmin;
+import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.ext.CachedRepository;
+import org.apache.ace.repository.impl.CachedRepositoryImpl;
+import org.apache.ace.repository.impl.FilebasedBackupRepository;
+import org.apache.ace.repository.impl.RemoteRepository;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;

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

Modified: incubator/ace/trunk/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/configurator/serveruseradmin/Activator.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.configurator.serveruseradmin;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.configurator.serveruseradmin;
 
 import java.util.Dictionary;
 

Modified: incubator/ace/trunk/server/src/org/apache/ace/configurator/useradmin/task/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/configurator/useradmin/task/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/configurator/useradmin/task/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/configurator/useradmin/task/Activator.java Sat Jun 27 20:21:28 2009
@@ -1,9 +1,26 @@
-package net.luminis.liq.configurator.useradmin.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.configurator.useradmin.task;
 
 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;

Modified: incubator/ace/trunk/server/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.configurator.useradmin.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.configurator.useradmin.task;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -9,10 +27,9 @@
 import java.util.Dictionary;
 import java.util.Properties;
 
-import net.luminis.liq.repository.ext.CachedRepository;
-import net.luminis.liq.repository.impl.CachedRepositoryImpl;
-import net.luminis.liq.resourceprocessor.useradmin.UserAdminConfigurator;
-
+import org.apache.ace.repository.ext.CachedRepository;
+import org.apache.ace.repository.impl.CachedRepositoryImpl;
+import org.apache.ace.resourceprocessor.useradmin.UserAdminConfigurator;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;

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

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

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/Activator.java Sat Jun 27 20:21:28 2009
@@ -1,14 +1,31 @@
-package net.luminis.liq.deployment.provider.filebased;
-
-import net.luminis.liq.deployment.provider.DeploymentProvider;
+/*
+ * 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.provider.filebased;
 
+import org.apache.ace.deployment.provider.DeploymentProvider;
 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.deployment.provider.filebased";
+    public static final String PID = "org.apache.ace.deployment.provider.filebased";
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.deployment.provider.filebased;
+/*
+ * 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.provider.filebased;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,10 +38,9 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
-import net.luminis.liq.deployment.provider.ArtifactData;
-import net.luminis.liq.deployment.provider.DeploymentProvider;
-import net.luminis.liq.deployment.provider.impl.ArtifactDataImpl;
-
+import org.apache.ace.deployment.provider.ArtifactData;
+import org.apache.ace.deployment.provider.DeploymentProvider;
+import org.apache.ace.deployment.provider.impl.ArtifactDataImpl;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 import org.osgi.service.cm.ConfigurationException;

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java Sat Jun 27 20:21:28 2009
@@ -1,12 +1,29 @@
-package net.luminis.liq.deployment.provider.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.provider.impl;
 
 import java.net.URL;
 import java.util.Map;
 import java.util.jar.Attributes;
 
-import net.luminis.liq.client.repository.object.DeploymentArtifact;
-import net.luminis.liq.deployment.provider.ArtifactData;
-
+import org.apache.ace.client.repository.object.DeploymentArtifact;
+import org.apache.ace.deployment.provider.ArtifactData;
 import org.osgi.framework.Constants;
 
 /**

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/repositorybased/Activator.java Sat Jun 27 20:21:28 2009
@@ -1,14 +1,31 @@
-package net.luminis.liq.deployment.provider.repositorybased;
-
-import net.luminis.liq.deployment.provider.DeploymentProvider;
+/*
+ * 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.provider.repositorybased;
 
+import org.apache.ace.deployment.provider.DeploymentProvider;
 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.deployment.provider.repositorybased";
+    public static final String PID = "org.apache.ace.deployment.provider.repositorybased";
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.deployment.provider.repositorybased;
+/*
+ * 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.provider.repositorybased;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,19 +41,18 @@
 import javax.xml.xpath.XPathFactory;
 import javax.xml.xpath.XPathVariableResolver;
 
-import net.luminis.liq.client.repository.helper.bundle.BundleHelper;
-import net.luminis.liq.client.repository.object.DeploymentArtifact;
-import net.luminis.liq.deployment.provider.ArtifactData;
-import net.luminis.liq.deployment.provider.DeploymentProvider;
-import net.luminis.liq.deployment.provider.impl.ArtifactDataImpl;
-import net.luminis.liq.repository.RangeIterator;
-import net.luminis.liq.repository.Repository;
-import net.luminis.liq.repository.ext.BackupRepository;
-import net.luminis.liq.repository.ext.CachedRepository;
-import net.luminis.liq.repository.impl.CachedRepositoryImpl;
-import net.luminis.liq.repository.impl.FilebasedBackupRepository;
-import net.luminis.liq.repository.impl.RemoteRepository;
-
+import org.apache.ace.client.repository.helper.bundle.BundleHelper;
+import org.apache.ace.client.repository.object.DeploymentArtifact;
+import org.apache.ace.deployment.provider.ArtifactData;
+import org.apache.ace.deployment.provider.DeploymentProvider;
+import org.apache.ace.deployment.provider.impl.ArtifactDataImpl;
+import org.apache.ace.repository.RangeIterator;
+import org.apache.ace.repository.Repository;
+import org.apache.ace.repository.ext.BackupRepository;
+import org.apache.ace.repository.ext.CachedRepository;
+import org.apache.ace.repository.impl.CachedRepositoryImpl;
+import org.apache.ace.repository.impl.FilebasedBackupRepository;
+import org.apache.ace.repository.impl.RemoteRepository;
 import org.osgi.framework.Version;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/servlet/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/servlet/Activator.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/servlet/Activator.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/servlet/Activator.java Sat Jun 27 20:21:28 2009
@@ -1,16 +1,34 @@
-package net.luminis.liq.deployment.servlet;
-import javax.servlet.http.HttpServlet;
+/*
+ * 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.servlet;
 
-import net.luminis.liq.deployment.provider.DeploymentProvider;
-import net.luminis.liq.deployment.streamgenerator.StreamGenerator;
+import javax.servlet.http.HttpServlet;
 
+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;
 import org.osgi.service.log.LogService;
 
 public class Activator extends DependencyActivatorBase {
-    public static final String PID = "net.luminis.liq.deployment.servlet";
+    public static final String PID = "org.apache.ace.deployment.servlet";
 
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/servlet/DeploymentServlet.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/servlet/DeploymentServlet.java?rev=789011&r1=788992&r2=789011&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/servlet/DeploymentServlet.java (original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/servlet/DeploymentServlet.java Sat Jun 27 20:21:28 2009
@@ -1,4 +1,22 @@
-package net.luminis.liq.deployment.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.deployment.servlet;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,9 +28,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.luminis.liq.deployment.provider.DeploymentProvider;
-import net.luminis.liq.deployment.streamgenerator.StreamGenerator;
-
+import org.apache.ace.deployment.provider.DeploymentProvider;
+import org.apache.ace.deployment.streamgenerator.StreamGenerator;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;
 import org.osgi.service.log.LogService;



Mime
View raw message