svn commit: r652817 - in /incubator/sling/trunk: commons/osgi/src/main/java/org/apache/sling/commons/ commons/osgi/src/main/java/org/apache/sling/commons/osgi/ commons/osgi/src/main/java/org/apache/sling/osgi/ jcr/ocm/src/main/java/org/apache/sling/jcr...

[cz...@apache.org]

Author: cziegeler
Date: Fri May  2 09:54:33 2008
New Revision: 652817

URL: http://svn.apache.org/viewvc?rev=652817&view=rev
Log:
SLING-402: Move osgi/commons to commons/osgi - refactor to commons package.

Added:
    incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/commons/
    incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/commons/osgi/
      - copied from r652813, incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/osgi/commons/
Removed:
    incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/osgi/
Modified:
    incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
    incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java
    incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
    incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptorKey.java
    incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
    incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
    incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java

Modified: incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java?rev=652817&r1=652813&r2=652817&view=diff
==============================================================================
--- incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java (original)
+++ incubator/sling/trunk/commons/osgi/src/main/java/org/apache/sling/commons/osgi/OsgiUtil.java Fri May  2 09:54:33 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.osgi.commons;
+package org.apache.sling.commons.osgi;
 
 import java.util.ArrayList;
 import java.util.Dictionary;

Modified: incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java?rev=652817&r1=652816&r2=652817&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java (original)
+++ incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/impl/ObjectContentManagerFactoryImpl.java Fri May  2 09:54:33 2008
@@ -49,9 +49,9 @@
 import org.apache.jackrabbit.ocm.query.impl.QueryManagerImpl;
 import org.apache.jackrabbit.ocm.reflection.ReflectionUtils;
 import org.apache.jackrabbit.value.ValueFactoryImpl;
+import org.apache.sling.commons.osgi.OsgiUtil;
 import org.apache.sling.jcr.ocm.ObjectContentManagerFactory;
 import org.apache.sling.jcr.ocm.impl.classloader.MapperClassLoader;
-import org.apache.sling.osgi.commons.OsgiUtil;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.SynchronousBundleListener;

Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java?rev=652817&r1=652816&r2=652817&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Fri May  2 09:54:33 2008
@@ -34,13 +34,13 @@
 import org.apache.commons.collections.bidimap.TreeBidiMap;
 import org.apache.sling.api.resource.ResourceProvider;
 import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.commons.osgi.OsgiUtil;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
 import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
 import org.apache.sling.jcr.resource.internal.helper.Mapping;
 import org.apache.sling.jcr.resource.internal.helper.ResourceProviderEntry;
 import org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProviderEntry;
-import org.apache.sling.osgi.commons.OsgiUtil;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;

Modified: incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptorKey.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptorKey.java?rev=652817&r1=652816&r2=652817&view=diff
==============================================================================
--- incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptorKey.java (original)
+++ incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterFactoryDescriptorKey.java Fri May  2 09:54:33 2008
@@ -18,7 +18,7 @@
  */
 package org.apache.sling.adapter.internal;
 
-import org.apache.sling.osgi.commons.OsgiUtil;
+import org.apache.sling.commons.osgi.OsgiUtil;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 

Modified: incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java?rev=652817&r1=652816&r2=652817&view=diff
==============================================================================
--- incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java (original)
+++ incubator/sling/trunk/sling/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java Fri May  2 09:54:33 2008
@@ -28,7 +28,7 @@
 
 import org.apache.sling.api.adapter.AdapterFactory;
 import org.apache.sling.api.adapter.AdapterManager;
-import org.apache.sling.osgi.commons.OsgiUtil;
+import org.apache.sling.commons.osgi.OsgiUtil;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.log.LogService;

Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=652817&r1=652816&r2=652817&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Fri May  2 09:54:33 2008
@@ -53,10 +53,10 @@
 import org.apache.sling.api.servlets.HttpConstants;
 import org.apache.sling.api.servlets.ServletResolver;
 import org.apache.sling.api.servlets.OptingServlet;
+import org.apache.sling.commons.osgi.OsgiUtil;
 import org.apache.sling.core.servlets.AbstractServiceReferenceConfig;
 import org.apache.sling.core.servlets.ErrorHandler;
 import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.apache.sling.osgi.commons.OsgiUtil;
 import org.apache.sling.servlet.resolver.defaults.DefaultErrorHandlerServlet;
 import org.apache.sling.servlet.resolver.defaults.DefaultServlet;
 import org.apache.sling.servlet.resolver.helper.PathIterator;

Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java?rev=652817&r1=652816&r2=652817&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/resource/ServletResourceProvider.java Fri May  2 09:54:33 2008
@@ -37,8 +37,8 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceProvider;
 import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.commons.osgi.OsgiUtil;
 import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.apache.sling.osgi.commons.OsgiUtil;
 import org.osgi.framework.ServiceReference;
 
 public class ServletResourceProvider implements ResourceProvider {