felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r810999 - in /felix/trunk/fileinstall: ./ src/main/java/org/apache/felix/fileinstall/ src/main/java/org/apache/felix/fileinstall/internal/ src/main/java/org/apache/felix/fileinstall/listener/ src/main/java/org/apache/felix/fileinstall/util/...
Date Thu, 03 Sep 2009 15:39:18 GMT
Author: gnodet
Date: Thu Sep  3 15:39:17 2009
New Revision: 810999

URL: http://svn.apache.org/viewvc?rev=810999&view=rev
Log:
FELIX-1554: fileinstall should not export org.apache.felix.fileinstall and org.apache.felix.fileinstall.utils
packages

Added:
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactInstaller.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactInstaller.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactListener.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactListener.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactTransformer.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactTransformer.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Artifact.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Artifact.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/BundleTransformer.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/BundleTransformer.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ConfigInstaller.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Jar.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Scanner.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/BundleTransformerTest.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/BundleTransformerTest.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/ConfigInstallerTest.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/MockServiceTracker.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/MockServiceTracker.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/UtilTest.java
      - copied, changed from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/util/UtilTest.java
Removed:
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Artifact.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/BundleTransformer.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ConfigInstaller.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Scanner.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactInstaller.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactListener.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactTransformer.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/BundleTransformerTest.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/ConfigInstallerTest.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/MockServiceTracker.java
    felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/util/UtilTest.java
Modified:
    felix/trunk/fileinstall/pom.xml

Modified: felix/trunk/fileinstall/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/pom.xml?rev=810999&r1=810998&r2=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/pom.xml (original)
+++ felix/trunk/fileinstall/pom.xml Thu Sep  3 15:39:17 2009
@@ -53,14 +53,15 @@
         <configuration>
           <instructions>
             <Export-Package>
-                org.apache.felix.fileinstall*,
+                org.apache.felix.fileinstall;version=${project.version},
                 org.osgi.service.cm
             </Export-Package>
             <Import-Package>
+                !org.apache.felix.fileinstall.internal*,
                 org.osgi.service.log;resolution:=optional,
                 *
             </Import-Package>
-            <Bundle-Activator>org.apache.felix.fileinstall.FileInstall</Bundle-Activator>
+            <Bundle-Activator>org.apache.felix.fileinstall.internal.FileInstall</Bundle-Activator>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactInstaller.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactInstaller.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactInstaller.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactInstaller.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactInstaller.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactInstaller.java
(original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactInstaller.java
Thu Sep  3 15:39:17 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.fileinstall.listener;
+package org.apache.felix.fileinstall;
 
 import java.io.File;
 

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactListener.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactListener.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactListener.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactListener.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactListener.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactListener.java
(original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactListener.java
Thu Sep  3 15:39:17 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.fileinstall.listener;
+package org.apache.felix.fileinstall;
 
 import java.io.File;
 
@@ -23,8 +23,8 @@
  * Interface representing a custom deployment mechanism.
  * 
  * Classes must implement one of its sub-interface, either
- * {@link org.apache.felix.fileinstall.listener.ArtifactTransformer} or
- * {@link org.apache.felix.fileinstall.listener.ArtifactInstaller}.
+ * {@link ArtifactTransformer} or
+ * {@link ArtifactInstaller}.
  *
  */
 public interface ArtifactListener {

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactTransformer.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactTransformer.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactTransformer.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactTransformer.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactTransformer.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/listener/ArtifactTransformer.java
(original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ArtifactTransformer.java
Thu Sep  3 15:39:17 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.fileinstall.listener;
+package org.apache.felix.fileinstall;
 
 import java.io.File;
 

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Artifact.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Artifact.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Artifact.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Artifact.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Artifact.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Artifact.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Artifact.java
Thu Sep  3 15:39:17 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.io.File;
 
-import org.apache.felix.fileinstall.listener.ArtifactListener;
+import org.apache.felix.fileinstall.ArtifactListener;
 
 /**
  * An artifact that has been dropped into one watched directory.

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/BundleTransformer.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/BundleTransformer.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/BundleTransformer.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/BundleTransformer.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/BundleTransformer.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/BundleTransformer.java
(original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/BundleTransformer.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,7 +24,7 @@
 import java.util.jar.Manifest;
 import java.util.jar.Attributes;
 
-import org.apache.felix.fileinstall.listener.ArtifactTransformer;
+import org.apache.felix.fileinstall.ArtifactTransformer;
 
 /**
  * ArtifactTransformer for plain bundles.

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ConfigInstaller.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ConfigInstaller.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/ConfigInstaller.java
(original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,8 +24,8 @@
 import java.util.Hashtable;
 import java.util.Properties;
 
-import org.apache.felix.fileinstall.listener.ArtifactInstaller;
-import org.apache.felix.fileinstall.util.Util;
+import org.apache.felix.fileinstall.ArtifactInstaller;
+import org.apache.felix.fileinstall.internal.Util;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.cm.Configuration;
 

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
(original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -35,10 +35,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.felix.fileinstall.listener.ArtifactInstaller;
-import org.apache.felix.fileinstall.listener.ArtifactListener;
-import org.apache.felix.fileinstall.listener.ArtifactTransformer;
-import org.apache.felix.fileinstall.util.Util;
+import org.apache.felix.fileinstall.ArtifactInstaller;
+import org.apache.felix.fileinstall.ArtifactListener;
+import org.apache.felix.fileinstall.ArtifactTransformer;
+import org.apache.felix.fileinstall.internal.Util;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -629,7 +629,7 @@
 
     /**
      * Install an artifact and return the bundle object.
-     * It uses {@link org.apache.felix.fileinstall.Artifact#getPath()} as location
+     * It uses {@link Artifact#getPath()} as location
      * of the new bundle. Before installing a file,
      * it sees if the file has been identified as a bad file in
      * earlier run. If yes, then it compares to see if the file has changed

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.util.ArrayList;
 import java.util.Dictionary;
@@ -26,10 +26,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.felix.fileinstall.listener.ArtifactInstaller;
-import org.apache.felix.fileinstall.listener.ArtifactListener;
-import org.apache.felix.fileinstall.listener.ArtifactTransformer;
-import org.apache.felix.fileinstall.util.Util;
+import org.apache.felix.fileinstall.ArtifactInstaller;
+import org.apache.felix.fileinstall.ArtifactListener;
+import org.apache.felix.fileinstall.ArtifactTransformer;
+import org.apache.felix.fileinstall.internal.Util;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Jar.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Jar.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Jar.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Jar.java Thu
Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.io.File;
 import java.net.URI;

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Scanner.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Scanner.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Scanner.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.util.Map;
 import java.util.HashMap;

Copied: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java
(from r810936, felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java?p2=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java&p1=felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Util.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall.util;
+package org.apache.felix.fileinstall.internal;
 
 import java.io.IOException;
 import java.io.FileInputStream;

Copied: felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/BundleTransformerTest.java
(from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/BundleTransformerTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/BundleTransformerTest.java?p2=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/BundleTransformerTest.java&p1=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/BundleTransformerTest.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/BundleTransformerTest.java
(original)
+++ felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/BundleTransformerTest.java
Thu Sep  3 15:39:17 2009
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.io.File;
 
 import junit.framework.TestCase;
+import org.apache.felix.fileinstall.internal.BundleTransformer;
 
 /**
  * Test for the BundleTransformer

Copied: felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
(from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/ConfigInstallerTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java?p2=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java&p1=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/ConfigInstallerTest.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/ConfigInstallerTest.java
(original)
+++ felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 import java.io.File;
 import java.util.Hashtable;
@@ -29,6 +29,8 @@
 import org.osgi.framework.Bundle;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.Configuration;
+import org.apache.felix.fileinstall.internal.ConfigInstaller;
+import org.apache.felix.fileinstall.internal.FileInstall;
 
 /**
  * Tests for ConfigInstaller

Copied: felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
(from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java?p2=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java&p1=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java
(original)
+++ felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 
 import java.io.File;
@@ -29,6 +29,8 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.packageadmin.PackageAdmin;
+import org.apache.felix.fileinstall.internal.DirectoryWatcher;
+import org.apache.felix.fileinstall.internal.FileInstall;
 
 
 /**

Copied: felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/MockServiceTracker.java
(from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/MockServiceTracker.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/MockServiceTracker.java?p2=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/MockServiceTracker.java&p1=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/MockServiceTracker.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/MockServiceTracker.java
(original)
+++ felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/MockServiceTracker.java
Thu Sep  3 15:39:17 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall;
+package org.apache.felix.fileinstall.internal;
 
 
 import org.osgi.framework.BundleContext;

Copied: felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/UtilTest.java
(from r810936, felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/util/UtilTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/UtilTest.java?p2=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/UtilTest.java&p1=felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/util/UtilTest.java&r1=810936&r2=810999&rev=810999&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/util/UtilTest.java
(original)
+++ felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/UtilTest.java
Thu Sep  3 15:39:17 2009
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.fileinstall.util;
+package org.apache.felix.fileinstall.internal;
 
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
 import junit.framework.TestCase;
+import org.apache.felix.fileinstall.internal.Util;
 
 public class UtilTest extends TestCase
 {



Mime
View raw message